添加查询当前用户的第一层绑定单位

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

@@ -750,4 +750,27 @@ public class OrgUsrController extends BaseController {
         }
         return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode));
     }
+    
+    
+    /**
+     * 查询多个组织机构下面的所有人员列表信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前人员所属的第一级公司", notes = "查询当前人员所属的第一级公司")
+    @GetMapping(value = "find/getCompanyByUserId")
+    public ResponseModel<Object> getCompanyByUserId(@RequestParam Long userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId));
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
 }
\ No newline at end of file

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

@@ -31,6 +31,8 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+import freemarker.core.ReturnInstruction.Return;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +51,9 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.annotation.Resource;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
@@ -114,10 +119,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
-        List<OrgMenuDto> menuList = list.stream().map(o ->
-                new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
-                        ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(), false,
-                        o.getBizOrgCode()).setTotal(o.getTotal())).collect(Collectors.toList());
+		List<OrgMenuDto> menuList = list.stream()
+				.map(o -> new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
+						ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(),
+						false, o.getBizOrgCode()).setTotal(o.getTotal()))
+				.collect(Collectors.toList());
 		List<OrgMenuDto> result = new ArrayList<>();
 		Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
 		menuList.forEach(e -> map.put(e.getKey(), e));
@@ -401,7 +407,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			OrgUsr parent = this.getById(req.get("parentId").toString());
 			map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
 		}
-         //新加
+		// 新加
 		if (req.get("OrgCode") != null && req.get("OrgCode") != "") {
 
 			map.put("bizOrgCode", req.get("OrgCode"));
@@ -410,7 +416,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
 		if (req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
-            map.put("amosOrgCode", req.get("amosOrgId"));//当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
+			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
 		}
 
 		req.remove("bizOrgName");
@@ -626,7 +632,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return result;
 	}
 
-
 	@Override
 	public Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception {
 		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>();
@@ -651,7 +656,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return result;
 	}
 
-
 	@Override
 	public List<OrgUsr> selectCompanyDepartmentMsg() {
 		List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
@@ -840,8 +844,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public OrgUsrFormDto selectCompanyById(Long id) throws Exception {
 		OrgUsr orgUsr = getById(id);
 
-
-
 		// 动态表单数据
 		List<FormValue> formValue = getFormValue(id);
 		// bug 2580 返回值改为具体名称 chenzhao 2021-09-27 start
@@ -855,13 +857,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
 		orgUsrFormVo.setDynamicFormAlert(formValue);
 		BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
-        Map<String,String> Xfaq=orgUsrMapper.selectPersonone("消防安全负责人",id);
-        Map<String,String> Xfgl=orgUsrMapper.selectPersonone("消防安全管理人",id);
-        Map<String,String> Dwfz= orgUsrMapper.selectPersonone("法定代表人",id);
-        orgUsrFormVo.setXfaq(Xfaq!=null?Xfaq.get("name"):"");
-        orgUsrFormVo.setXfgl(Xfgl!=null?Xfgl.get("name"):"");
-        orgUsrFormVo.setDwfz(Dwfz!=null?Dwfz.get("name"):"");
-        orgUsrFormVo.setParentName( getById(orgUsr.getParentId()).getBizOrgName());
+		Map<String, String> Xfaq = orgUsrMapper.selectPersonone("消防安全负责人", id);
+		Map<String, String> Xfgl = orgUsrMapper.selectPersonone("消防安全管理人", id);
+		Map<String, String> Dwfz = orgUsrMapper.selectPersonone("法定代表人", id);
+		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("name") : "");
+		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("name") : "");
+		orgUsrFormVo.setDwfz(Dwfz != null ? Dwfz.get("name") : "");
+		orgUsrFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
 		return orgUsrFormVo;
 	}
 
@@ -1311,7 +1313,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		// 业主单位人员
 		List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
 		// 维保单位人员
-        List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0], userId);
+		List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0],
+				userId);
 		if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
 			throw new RuntimeException("人员绑定单位重复！");
 		}
@@ -1416,7 +1419,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list;
 	}
 
-
 	@Override
 	public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
 		List<CheckObjectDto> list = new ArrayList<>();
@@ -1497,7 +1499,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					orgUsrTreeDto.setNum(num);
 				}
 				// 只查出一级单位，顶级为西部机场集团
-                if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && value.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {
+				if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey())
+						&& value.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {
 					list.add(value);
 				}
 			}
@@ -1726,7 +1729,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUser;
 	}
 
-
 	public OrgUsr getByIduser(Serializable id) {
 		OrgUsr orgUser = this.baseMapper.selectById(id);
 		return orgUser;
@@ -1916,7 +1918,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrMapper.queryCompanyIdNew(bizOrgName);
 	}
 
-
 	public List<Map<String, Object>> getuserDetail(Long departmentId, List<Map<String, Object>> resulLists) {
 		OrgUsr resulList = this.baseMapper.selectById(departmentId);
 		if (resulList.getParentId() != null) {
@@ -1929,7 +1930,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 
-
 	public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
 		if (ValidationUtil.isEmpty(orgUserIds)) {
 			throw new Exception("账号不存在");
@@ -2039,14 +2039,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		// orgCode 前端调用接口生成 不再后台生成orgCode
 		/*
-		if (OrgPersonVo.getParentId() != null) {OrgUsrMapper
-			OrgUsr parent = getById(OrgPersonVo.getParentId());
-			if (parent != null && ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
-				orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
-			}
-		} else {
-			orgUsr.setBizOrgCode(getOrgCodeStr());
-		}*/
+		 * if (OrgPersonVo.getParentId() != null) {OrgUsrMapper OrgUsr parent =
+		 * getById(OrgPersonVo.getParentId()); if (parent != null &&
+		 * ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
+		 * orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); } } else {
+		 * orgUsr.setBizOrgCode(getOrgCodeStr()); }
+		 */
 		OrgUsrDto result = new OrgUsrDto();
 		if (orgUsr.getSequenceNbr() != null) { // 走更新方法
 			this.updateById(orgUsr);
@@ -2055,7 +2053,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			result = saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 		}
 
-
 		return result;
 	}
 
@@ -2083,7 +2080,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgPersonFormVo.setParentName(parent.getBizOrgName());
 		}
 		List<FormValue> dynamicFormAlert = orgPersonFormVo.getDynamicFormAlert();
-        Map<String, String> collect = dynamicFormAlert.stream().collect(HashMap::new, (map, item) -> map.put(item.getKey(), item.getValue()), HashMap::putAll);
+		Map<String, String> collect = dynamicFormAlert.stream().collect(HashMap::new,
+				(map, item) -> map.put(item.getKey(), item.getValue()), HashMap::putAll);
 		JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(orgPersonFormVo));
 		jsonObject.put("map", collect);
 		return jsonObject;
@@ -2112,7 +2110,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 
-
 	public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 		wrapper.eq(OrgUsr::getIsDelete, false);
@@ -2121,8 +2118,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return this.baseMapper.selectList(wrapper);
 	}
 
-
-
 	@Override
 	public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
 		List<String> orgTypeList = new ArrayList<>();
@@ -2150,6 +2145,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
 		return buildTreeParallel(list);
 	}
+
 	/**
 	 * 同步单位信息到防火监督point表
 	 *
@@ -2201,21 +2197,42 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public OrgUsrDto getCompanyByBizOrgCodeList(String bizOrgCode) {
 
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr::getBizOrgCode,bizOrgCode);
-        wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		wrapper.eq(BaseEntity::getIsDelete, false);
 		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
 		OrgUsrDto orgUsrDto = new OrgUsrDto();
-        if (!orgUsr.getBizOrgType().equals(COMPANY_VALUE)){
+		if (!orgUsr.getBizOrgType().equals(COMPANY_VALUE)) {
 			for (int i = 0; i < 10; i++) {
 				OrgUsr result = baseMapper.selectById(orgUsr.getParentId());
-                if (result.getBizOrgType().equals(COMPANY_VALUE)){
-                    BeanUtils.copyProperties(result,orgUsrDto);
+				if (result.getBizOrgType().equals(COMPANY_VALUE)) {
+					BeanUtils.copyProperties(result, orgUsrDto);
 					break;
 				}
 			}
-        }else {
-            BeanUtils.copyProperties(orgUsr,orgUsrDto);
+		} else {
+			BeanUtils.copyProperties(orgUsr, orgUsrDto);
 		}
 		return orgUsrDto;
 	}
+
+	public OrgUsr getCompanyByUserId(Long userId) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getSequenceNbr, userId);
+		wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
+		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
+		return getCompanyByParentId(orgUsr.getParentId());
+	}
+
+	public OrgUsr getCompanyByParentId(String parentId) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getSequenceNbr, parentId);
+		OrgUsr orgUsr1 = baseMapper.selectOne(wrapper);
+		if (!orgUsr1.getBizOrgType().equals(CommonConstant.BIZ_ORG_TYPE_COMPANY)) {
+			return getCompanyByParentId(orgUsr1.getParentId());
+		}
+		return orgUsr1;
+	}
+
 }