fix(jg):个人主体启停业务处理

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

@@ -247,7 +247,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
                 jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
-                jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+                jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                        reginParams.getCompany().getCompanyCode().split("_")[1] :
+                        reginParams.getCompany().getCompanyCode());
                 jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
                 jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
                 jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
@@ -379,7 +381,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         jgEnableDisable.setApplyDate(new Date());
         jgEnableDisable.setReceiveCompanyCode(splitMaintenanceUnitCode[0]);
         jgEnableDisable.setReceiveOrgName(splitMaintenanceUnitCode[1]);
-        jgEnableDisable.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+        jgEnableDisable.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
         jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
         jgEnableDisable.setRemark(String.valueOf(map.get("remark")));
         jgEnableDisable.setApplyType(map.getString("applyType"));
@@ -473,7 +477,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Page<Map<String, Object>> pageList(Page<Map<String, Object>> page, String sort, JgEnableDisableDto dto) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if ("company".equals(reginParams.getCompany().getLevel())) {
-            dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                    reginParams.getCompany().getCompanyCode().split("_")[1] :
+                    reginParams.getCompany().getCompanyCode());
         } else {
             dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
         }