From bfd8dfe68d3cb74dbde163f458c75796bd13c867 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Tue, 17 Oct 2023 17:22:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index d08dd274..af3f6c29 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/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{

From 197e640871e2a8a181875ad16db459f87b35bab3 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Wed, 18 Oct 2023 15:46:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/list_signature.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/sunVillage_info/list_signature.vue b/src/views/sunVillage_info/list_signature.vue
index 09b67c83..c2451ad4 100644
--- a/src/views/sunVillage_info/list_signature.vue
+++ b/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;