修改代码

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

@@ -769,16 +769,20 @@ 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.stream().forEach(e->objects.add(e.getName()));
+		list.stream().forEach(e->objects.add(e.getCode()));
 		//判断当前登录人权限是否处于特殊类型
 		if (objects.contains(authKey)){
 			//判断当前登录人部门是否处于特殊部门
 				if (objects.contains(personIdentity.getCompanyId())) {
+					//查询当前登录人所属单位/部门
+					OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
+
+					//查询当前登录人父级单位
 					LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-					wrapper.eq(OrgUsr::getParentId,personIdentity.getCompanyId());
+					wrapper.eq(OrgUsr::getSequenceNbr,orgUsr.getParentId());
 					wrapper.eq(BaseEntity::getIsDelete,false);
-					OrgUsr orgUsr = orgUsrMapper.selectOne(wrapper);
-					personIdentity.setBizOrgCode(orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : personIdentity.getBizOrgCode());
+					OrgUsr result = orgUsrMapper.selectOne(wrapper);
+					bizOrgCode = result.getBizOrgCode() != null? result.getBizOrgCode() : personIdentity.getBizOrgCode();
 				}
 		}
 		// 权限处理