Commit 32f8c132 authored by tianbo's avatar tianbo

根据登陆人获取单位列表 -- 接口逻辑修改

parent c5a4ef0a
...@@ -1461,7 +1461,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1461,7 +1461,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
for (CheckObjectDto orgUsr : companyDepartmentMsgList) { for (CheckObjectDto orgUsr : companyDepartmentMsgList) {
if (orgUsr.getSequenceNbr().equals(parentId)) { if (orgUsr.getSequenceNbr().equals(parentId)) {
if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey())
&& ObjectUtils.isEmpty(orgUsr.getParentId())) { && orgUsr.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {// 树节点一级单位
return orgUsr.getSequenceNbr(); return orgUsr.getSequenceNbr();
} else { } else {
if (!StringUtils.isEmpty(orgUsr.getParentId())) { if (!StringUtils.isEmpty(orgUsr.getParentId())) {
...@@ -1492,11 +1492,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1492,11 +1492,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if (!ObjectUtils.isEmpty(orgUsrTreeDto)) { if (!ObjectUtils.isEmpty(orgUsrTreeDto)) {
int num = orgUsrTreeDto.getNum() + value.getNum(); int num = orgUsrTreeDto.getNum() + value.getNum();
orgUsrTreeDto.setNum(num); orgUsrTreeDto.setNum(num);
} else { }
// 只查出一级单位,顶级为西部机场集团 // 只查出一级单位,顶级为西部机场集团
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); list.add(value);
}
} }
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment