修改bug

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -772,6 +773,16 @@ public class OrgUsrController extends BaseController {
 		queryWrapper.eq("type", "SpecialType").or().eq("type", "SpecialDepartment");
 		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 		List<String> objects = new ArrayList<>();
+		List<DataDictionary> specialDepartment = list.stream().filter(e -> e.getType().equals("SpecialDepartment")).collect(Collectors.toList());
+
+		for (DataDictionary dataDictionary : specialDepartment) {
+			LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(OrgUsr::getParentId,dataDictionary.getCode());
+			wrapper.eq(BaseEntity::getIsDelete,false);
+			List<OrgUsr> orgUsrs = orgUsrMapper.selectList(wrapper);
+			orgUsrs.forEach(e->objects.add(e.getSequenceNbr().toString()));
+		}
+
 		list.stream().forEach(e->objects.add(e.getCode()));
 		//判断当前登录人权限是否处于特殊类型
 		if (objects.contains(authKey) || AUTH_SPECIAL_KEY.equals(authKey)){
@@ -781,13 +792,9 @@ public class OrgUsrController extends BaseController {
 					OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
 					//判断登陆人是否已经是顶级节点单位
 					if (orgUsr.getParentId() != null ){
-						//查询当前登录人父级单位
-						LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-						wrapper.eq(OrgUsr::getSequenceNbr,orgUsr.getParentId());
-						wrapper.eq(BaseEntity::getIsDelete,false);
-						OrgUsr result = orgUsrMapper.selectOne(wrapper);
-						bizOrgCode = result.getBizOrgCode() != null? result.getBizOrgCode() : personIdentity.getBizOrgCode();
-
+						orgUsr  =orgUsrService.selectParentOrgUsr(orgUsr);
+						bizOrgCode = orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : personIdentity.getBizOrgCode();
+						
 					}
 
 				}
@@ -799,6 +806,8 @@ public class OrgUsrController extends BaseController {
 
 
 
+
+
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)

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

@@ -893,6 +893,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrFormVo;
 	}
 
+	public OrgUsr selectParentOrgUsr(OrgUsr orgUsr){
+		if (orgUsr.getBizOrgType().equals("COMPANY")){
+			return orgUsr ;
+		}
+			LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(OrgUsr::getSequenceNbr,orgUsr.getParentId());
+			wrapper.eq(BaseEntity::getIsDelete,false);
+			orgUsr = orgUsrMapper.selectOne(wrapper);
+			return selectParentOrgUsr(orgUsr);
+
+	}
+
 	@Override
 	public IPage<OrgUsr> bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception {