修复居民查询筛选所属组织不生效的bug

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;
           }