修改监管码生成

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -309,6 +309,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
         String division = ObjectUtils.isEmpty(divisionMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), city).get("code").toString() : divisionMap.get("code").toString();
         StringBuilder supervisorCode = new StringBuilder();
+        supervisorCode.append(division).append(equipCategory).append("-");
         //获取行政区划区县、市是否存在历史监管码
         CategoryOtherInfo supervisor = categoryOtherInfoMapper.selectSupervisorCode(supervisorCode.toString());
         //查询对应record对应数据
@@ -317,7 +318,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             if (!ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
                 supervisorCode = new StringBuilder(otherInfo.getSupervisoryCode());
             } else {
-                supervisorCode.append(division).append(equipCategory).append("-");
                 //生成对应监管码
                 if (!ObjectUtils.isEmpty(supervisor)) {
                     if (supervisor.getSupervisoryCode() != null) {
@@ -339,6 +339,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
                 }
             }
+        } else {
+            supervisorCode = null;
         }
 
         StringBuilder elevatorCode = new StringBuilder();