Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -971,7 +971,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                 try {
                     String newName = jgChangeRegistrationName.getNewUseUnitName();
                     if (CompanyTypeEnum.INDIVIDUAL.getName().equals(unitType)) {
-                        newName = String.format("%s_%s", jgChangeRegistrationName.getUseUnitCreditCode(), jgChangeRegistrationName.getNewUseUnitName());
+                        newName = String.format("%s_%s", jgChangeRegistrationName.getUseUnitCreditCode().split("_")[1], jgChangeRegistrationName.getNewUseUnitName());
                     }
                     Privilege.companyClient.updateCompanyName(jgChangeRegistrationName.getUseUnitCreditCode(), newName);
                 } catch (InnerInvokException e) {

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

@@ -185,6 +185,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     public List<JgVehicleInformation> save(String submit, JSONObject map) {
         try {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
+            CompanyBo company = reginParams.getCompany();
+
             JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
 
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
@@ -193,7 +195,9 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 throw new BadRequest(CollectionUtils.isEmpty(equipmentLists) ? "请选择设备信息!" : "请选择相同充装介质设备！");
             }
             if (SUBMIT_TYPE_FLOW.equals(submit)) {
-                this.repeatUsedEquipCheck(equipmentLists, reginParams.getCompany().getCompanyCode());
+                // 个人主体的身份证（6600_620422199903010258） 特殊处理 只取_后的身份证号码
+                this.repeatUsedEquipCheck(equipmentLists,
+                        CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             }
             List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
                     equipmentLists.stream()
@@ -213,7 +217,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     .min(Date::compareTo)
                     .orElse(null));
 
-            CompanyBo company = reginParams.getCompany();
             vehicleInfoDto.setCreateDate(new Date());
             vehicleInfoDto.setPromoter(reginParams.getUserModel().getUserId());