Merge branch 'develop_tzs_bugfix' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRegisterChangeDataDto.java

@@ -14,7 +14,7 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "设备种类" ,isExist = false)
     private String equList;
 
-    @FieldDisplayDefine(value = "设备类别" ,isExist = false)
+    @FieldDisplayDefine(value = "设备类别")
     private String equCategory;
 
     @FieldDisplayDefine(value = "设备代码")

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/CommonServiceImpl.java

@@ -3035,6 +3035,10 @@ public class CommonServiceImpl implements ICommonService {
      */
     public String isRegistrationNumberUsedByOtherUnits(String useRegistrationCode) {
         String companyCode = getSelectedOrgInfo().getCompany().getCompanyCode();
+        String companyType = getSelectedOrgInfo().getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            companyCode = companyCode.split("_")[1];
+        }
         return commonMapper.isRegistrationNumberUsedByOtherUnits(useRegistrationCode, companyCode);
     }
 }
\ No newline at end of file

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/EquipChangeDataUpdateService.java

@@ -47,6 +47,7 @@ public class EquipChangeDataUpdateService {
         LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(IdxBizJgRegisterInfo::getRecord, record);
         updateWrapper.set(IdxBizJgRegisterInfo::getEquCode, registerChangeDataDto.getEquCode());
+        updateWrapper.set(IdxBizJgRegisterInfo::getEquCategory, registerChangeDataDto.getEquCategory());
         updateWrapper.set(IdxBizJgRegisterInfo::getEquDefine, registerChangeDataDto.getEquDefine());
         updateWrapper.set(IdxBizJgRegisterInfo::getProductName, registerChangeDataDto.getProductName());
         updateWrapper.set(IdxBizJgRegisterInfo::getEquType, registerChangeDataDto.getEquType());
@@ -118,6 +119,7 @@ public class EquipChangeDataUpdateService {
             esEquipmentCategoryDto.setEQU_CODE(registerChangeDataDto.getEquCode());
             esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType());
             esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
+            esEquipmentCategoryDto.setEQU_CATEGORY_CODE(registerChangeDataDto.getEquCategory());
             if (StringUtils.isEmpty(registerChangeDataDto.getEquDefine())) {
                 esEquipmentCategoryDto.setEQU_DEFINE(null);
             } else {