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

@@ -130,6 +130,25 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonService.getUnitListByType(type));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getMessage")
+    public ResponseModel<Map<String, Object>> getMessage() {
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        HashMap<String, Object> map = new HashMap<>();
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
+            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
+            map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+        } else {
+            map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+            map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        }
+        return ResponseHelper.buildResponse(map);
+    }
+
     /**
      * 查找当前公司下所属的安全管理员
      *

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -112,17 +112,6 @@ public class JgChangeRegistrationReformController extends BaseController {
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
 	}
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET", value = "获取使用单位code及name", notes = "获取使用单位code及name")
-	@GetMapping(value = "/getMessage")
-	public ResponseModel<Map<String, Object>> getMessage() {
-		ReginParams selectedOrgInfo = getSelectedOrgInfo();
-		HashMap<String, Object> map = new HashMap<>();
-		map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
-		map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
-		return ResponseHelper.buildResponse(map);
-	}
-
 	/**
 	 * 改造登记-导出使用登记证
 	 * @param response 返回