因个人注册衍生的一码通问题修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -103,6 +103,7 @@ public class ControllerAop {
 		urls.add("^/tcm/flc-unit-info/hasExistUser/[A-Za-z0-9_-]+");
 		urls.add("/tcm/reg-unit-info/save");
 		urls.add("/ymt/equipment-category/getFormRecordById");
+		urls.add("/ymt//tzs-auth-api/getCodeAndName");
 		urls.add("/elevator/alert-called/getWorkOderNumber");
 		urls.add("/elevator/alert-called/save");
 		// 获取请求路径

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/TzsAuthController.java

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.TzsCitInfo;
 import com.yeejoin.amos.boot.module.ymt.api.service.TzsAuthService;
 import com.yeejoin.amos.boot.module.ymt.biz.service.impl.TzsCitInfoServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -124,4 +127,30 @@ public class TzsAuthController extends BaseController {
 		}
 		return ResponseHelper.buildResponse(map);
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getCodeAndName")
+	@ApiOperation(httpMethod = "GET", value = "获取当前登录用户所在公司code和公司名称", notes = "获取当前登录用户所在公司code和公司名称")
+	public ResponseModel<Map<String, Object>> getCodeAndName() {
+
+		List<CompanyModel> companyModels = FeignUtil.remoteCall(() -> Privilege.companyClient.queryListByChild(RequestContext.getExeUserId()));
+		if (companyModels.isEmpty()) {
+			throw new BadRequest("未指定人员归属单位信息");
+		}
+		String companyType = companyModels.get(0).getCompanyType();
+		String companyCode = companyModels.get(0).getCompanyCode();
+		String companyName = companyModels.get(0).getCompanyName();
+		Map<String, Object> map = new HashMap<>();
+		if("个人主体".equals(companyType)){
+			map.put("USE_UNIT_NAME", companyName.split("_")[1]);
+			map.put("USE_UNIT_CREDIT_CODE", companyCode.split("_")[1]);
+			map.put("companyType", "person");
+		} else {
+			map.put("USE_UNIT_NAME", companyName);
+			map.put("USE_UNIT_CREDIT_CODE", companyCode);
+			map.put("companyType", "company");
+		}
+		return ResponseHelper.buildResponse(map);
+	}
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1827,7 +1827,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         JSONObject object = getCompanyType().get(0);
         String level = object.getString("level");
         String code = object.getString("orgCode");
-        String companyCode = object.getString("companyCode");
+        String companyCode = object.getString("companyCode").contains("_") ?
+                object.getString("companyCode").split("_")[1] : object.getString("companyCode");
         if (!ValidationUtil.isEmpty(level)) {
             if (LEVEL.equals(level)) {
                 //企业