修改监管数据同步获取监管单位报错问题

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/PrivilegeCompanyUpdateAddListener.java

@@ -103,11 +103,29 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         updateWrapper.eq("use_code",object.getString("unit_code"));
 
         String regCode = object.getString("reg_code");
-        CompanyModel supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
+        CompanyModel supervisePrivilegeCompanyModel;
+        if (!ValidationUtil.isEmpty(regCode)) {
+            supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
 
-        if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+            if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
+                supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
+
+                if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
+                    logger.error("【" + object.getString("unit_name") + "】对应监管企业为空");
+                    return;
+                }
+            }
+        } else {
             supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
+            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
+                logger.error("【" + object.getString("unit_name") + "】对应监管企业为空");
+                return;
+            }
         }
+        tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
+        tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
+        companyModel.setParentId(supervisePrivilegeCompanyModel.getSequenceNbr());
+
         if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
             tzBaseEnterpriseInfo.setUnitType("");
         }
@@ -116,14 +134,6 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
         }
 
         try {
-            if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
-                logger.error("【" + object.getString("unit_name") + "】对应监管企业为空");
-                return;
-            }
-            tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
-            tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
-            companyModel.setParentId(supervisePrivilegeCompanyModel.getSequenceNbr());
-
             if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
                 //当企业表、平台表 中没有时
                 tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);