增加查询单位接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

 package com.yeejoin.amos.boot.biz.common.bo;
 
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
@@ -27,6 +28,7 @@ public class ReginParams implements Serializable {
         private String companyId;
         private String companyName;
         private String bizOrgCode;
+        private String companyBizOrgCode;
     }
 
     public PersonIdentity getPersonIdentity() {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserDto.java

@@ -40,5 +40,7 @@ public class UserDto {
 
     @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
     private String bizOrgType;
+    @ApiModelProperty(value = "所在单位是部门时，获取部门上级公司code")
+    private String companyBizOrgCode;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -307,6 +307,9 @@ public interface IOrgUsrService {
 
     UserDto getUserParentInfo(String userId);
 
+    UserDto selectByIdUser( String userId);
+
+
     /**
      * 根据机构类型获取列表不分页
      * @param orgTypes 机构类型（逗号分割）

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -146,6 +146,14 @@ public class OrgPersonController extends BaseController {
         return ResponseHelper.buildResponse(orgPersonFormDto);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUser/{id}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+    public ResponseModel<UserDto> selectByIdUser(HttpServletRequest request, @PathVariable String id) throws Exception {
+        UserDto userDto = iOrgUsrService.selectByIdUser(id);
+        return ResponseHelper.buildResponse(userDto);
+    }
+
     /**
      * @param request
      * @param id

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2624,6 +2624,55 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 
+	@Override
+	public UserDto selectByIdUser(String userId) {
+		OrgUsr orgUsr = orgUsrMapper.queryByUserId(Long.parseLong(userId));
+		if (null != orgUsr) {
+			UserDto userDto = new UserDto();
+			String parentId = orgUsr.getParentId();
+			userDto.setPersonSeq(String.valueOf(orgUsr.getSequenceNbr()));
+			userDto.setPersonName(orgUsr.getBizOrgName());
+			OrgUsr bizOrg = orgUsrMapper.queryBySequenceNbr(parentId);
+			if (!ObjectUtils.isEmpty(bizOrg)) {
+				userDto.setBizOrgType(bizOrg.getBizOrgType());
+				userDto.setBizOrgCode(bizOrg.getBizOrgCode());
+				userDto.setCompanyId(String.valueOf(bizOrg.getSequenceNbr()));
+				userDto.setCompanyName(bizOrg.getBizOrgName());
+
+				if(bizOrg.getBizOrgType().equals("COMPANY")){
+					userDto.setCompanyBizOrgCode(bizOrg.getBizOrgCode());
+				}else{
+					userDto.setCompanyBizOrgCode(getCompany(userDto));
+				}
+
+			} else {
+				throw new RuntimeException("人员所在公司不存在");
+			}
+			return userDto;
+		} else {
+			return new UserDto();
+		}
+	}
+
+
+
+
+	public String getCompany(UserDto userDto ){
+		if(userDto.getBizOrgType().equals("COMPANY")){
+
+			return userDto.getBizOrgCode();
+		}else{
+			return getCompany(userDto);
+		}
+	}
+
+
+
+
+
+
+
+
 	public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 		wrapper.eq(OrgUsr::getIsDelete, false);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

+package com.yeejoin.amos.patrol.config;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2022/7/19
+ */
+public class PersonIdentifyAspect {
+}