Revert "修改行社用户导出物防建设达标情况汇总和安全保卫工作情况统计"

This reverts commit 68904fcb6966f76829f8a1870691453beb984d10.

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -194,7 +194,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             sysOrgs = this.selectSysOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.HANG_SHE.getCode());
         } else if (sysOrg.getType() == OrgTypeEnum.HANG_SHE.getCode()) {
             //判断查询机构为行社时 查询行社内的营业网点
-            sysOrgs = this.selectSysOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.HANG_SHE.getCode());
+            sysOrgs = this.selectSysOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.YINGYE_WANGDIAN.getCode());
         }
 
         List<SysOrg> allChildOrgs = this.selectSysOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.YINGYE_WANGDIAN.getCode());
@@ -309,7 +309,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 || org.getType() == OrgTypeEnum.DIQU_HANG_SHE.getCode()) {
             sysOrgs = this.selectSysOrgByPathAndType(org.getPath(), OrgTypeEnum.HANG_SHE.getCode());
         } else if (org.getType() == OrgTypeEnum.HANG_SHE.getCode()) {
-            sysOrgs = this.selectSysOrgByPathAndType(org.getPath(), OrgTypeEnum.HANG_SHE.getCode());
+            sysOrgs = this.selectSysOrgByPathAndType(org.getPath(), OrgTypeEnum.YINGYE_WANGDIAN.getCode());
         }
         return sysOrgs;
     }

soc-modules/soc-modules-system/src/main/resources/bootstrap.yml

@@ -13,13 +13,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 84450d63-8d27-41ca-aa51-6b5818f65068
+        namespace: ffd30d7d-0a40-4674-ab19-e00aef378714
         # 服务注册地址
-        server-addr: 10.87.23.42:8847
+        server-addr: 10.87.21.103:8847
       config:
-        namespace: 84450d63-8d27-41ca-aa51-6b5818f65068
+        namespace: ffd30d7d-0a40-4674-ab19-e00aef378714
         # 配置中心地址
-        server-addr: 10.87.23.42:8847
+        server-addr: 10.87.21.103:8847
         # 配置文件格式
         file-extension: yml
         # 共享配置