Merge branch 'develop_tzs_main' into develop_tzs_register

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

@@ -899,8 +899,10 @@ public class EquipClaimServiceImpl {
         supervisionInfo.setRecord(record);
         supervisionInfo.setRecDate(timestamp);
         supervisionInfo.setSequenceNbr(Objects.toString(equipInfo.get("SUPERVISIONINFO_SEQ"), null));
-        supervisionInfo.setOrgBranchCode(Objects.toString(equipInfo.get("orgBranchCode"), "").split("_")[0]);
-        supervisionInfo.setOrgBranchName(Objects.toString(equipInfo.get("orgBranchCode"), "").split("_")[1]);
+        if (!ValidationUtil.isEmpty(equipInfo.get("orgBranchCode")) && Objects.toString(equipInfo.get("orgBranchCode"), null).contains("_")) {
+            supervisionInfo.setOrgBranchCode(Objects.toString(equipInfo.get("orgBranchCode"), null).split("_")[0]);
+            supervisionInfo.setOrgBranchName(Objects.toString(equipInfo.get("orgBranchCode"), null).split("_")[1]);
+        }
         iIdxBizJgSupervisionInfoService.saveOrUpdateData(supervisionInfo);
         // 其他信息
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgOtherInfo.class);

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

@@ -35,7 +35,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.common.api.enums.ConstructionTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.EquipmentCategoryService;
 import com.yeejoin.amos.boot.module.jg.api.common.DataDockTemplateVersionUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
@@ -1905,6 +1904,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } else {
                 supervisionInfoMap = convertCamelToUnderscore(supervisionInfo, null);
                 supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
+                supervisionInfoMap.put("orgBranchCode", supervisionInfo.getOrgBranchCode() + "_" + supervisionInfo.getOrgBranchName());
             }
             if (!supervisionInfoMap.isEmpty()) {
                 Map<String, Object> filterMap = supervisionInfoMap.entrySet()