修改bug

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

@@ -1442,7 +1442,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Override
 	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
 		Map<String, Object> param = new HashMap<>();
-		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+
+		if (StringUtils.isNotEmpty(type) && type.equals("COMPANY")){
+			//查询当前登录人所属单位/部门
+			OrgUsr orgUsr = orgUsrMapper.selectById(reginParams.getPersonIdentity().getCompanyId());
+			//判断登陆人是否已经是顶级节点单位
+			if (orgUsr.getParentId() != null ){
+				orgUsr  =this.selectParentOrgUsr(orgUsr);
+				bizOrgCode = orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : reginParams.getPersonIdentity().getBizOrgCode();
+
+			}
+		}
+		param.put("bizOrgCode", bizOrgCode);
 		param.put("type", type);
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
 		return buildTreeParallel(list);