From 800aa49b288bbdb020769c27e11898982beaa7c9 Mon Sep 17 00:00:00 2001
From: duanliangtao <48194157+duanliangtao@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=85=E6=B0=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=AD=9B=E9=80=89=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9c92a08ba..4841c8813 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -334,7 +334,7 @@ export default {
         buildId: null,
         villageId: null,
         gridId: null,
-        agencyId: null,
+        // agencyId: null,
       },
       defaultProps: {
         children: "children",
@@ -568,12 +568,14 @@ export default {
           // 处理 agencyId
           if (Array.isArray(agencyId) && agencyId.length) {
             _obj.agencyId = agencyId[agencyId.length - 1];
-          } else {
+          }else if(agencyId){
+            _obj.agencyId = agencyId;
+          }else{
             _obj.agencyId = "";
           }
           _obj.level = level || "";
           _obj.orgType = level || "";
-          _obj = { ..._obj, ...this.searchAgencyObj };
+          _obj = { ...this.searchAgencyObj , ..._obj};
           if (type) {
             this.currentPage = 1;
           }