Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/homesteadSurvey/index.vue

@@ -413,7 +413,16 @@
           }*/
           let userId = this.$store.state.user.userId;
           let businessLevel = this.$store.getters.businessLevel;
-          if(businessLevel === "2" || item.rwzxrIds.includes(userId)){
+          let status = false;
+          if(item.rwzxrIds != null && item.rwzxrIds !== ""){
+            let ids = item.rwzxrIds.split(",");
+            ids.forEach(function(id){
+              if(userId === parseInt(id)){
+                status = true;
+              }
+            });
+          }
+          if(businessLevel === "2" && status){
             localStorage.setItem("surveyItem",JSON.stringify(item));
             this.qiehuan(item.deptId);
           }else{

src/views/sunVillage_info/list_signature.vue

@@ -141,7 +141,9 @@
       getList(){
         var _this = this;
         contractFirstList(_this.queryParams).then(response => {
-          _this.applicationList = response.rows;
+          response.rows.forEach(item => {
+            _this.applicationList.push(item);
+          });
 
           if(_this.applicationList.length >= response.total){
             _this.finished = true;