Merge remote-tracking branch 'origin/develop_tzs_register' 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/controller/JgVehicleInformationController.java

@@ -126,8 +126,13 @@ public class JgVehicleInformationController extends BaseController {
                                                                 @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
         ReginParams info = getSelectedOrgInfo();
+        String companyCode = info.getCompany().getCompanyCode();
+        // 使用单位为个人时候 特殊处理
+        if (companyCode.split("_").length > 1) {
+            companyCode = companyCode.split("_")[1];
+        }
         dto.setCurrentUserId(info.getUserModel().getUserId());
-        dto.setUseUnitCreditCode(info.getCompany().getCompanyCode());
+        dto.setUseUnitCreditCode(companyCode);
         if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
             dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
         } else {

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

@@ -176,8 +176,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         }
 
         // 使用单位信息
-        vehicleInfoDto.setUseUnitName(company.getCompanyName());
-        vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
+        if("个人主体".equals(company.getCompanyType())){
+            vehicleInfoDto.setUseUnitName(company.getCompanyName().split("_")[1]);
+            vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+        }else {
+            vehicleInfoDto.setUseUnitName(company.getCompanyName());
+            vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
+        }
+
 
         // 接收单位信息
         if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {