Skip to content

A
amos-boot-biz
Commit 3b6f2b34 authored by litengwei's avatar litengwei
Browse files
Options

Merge remote-tracking branch 'origin/develop_dl_bugfix_0723' into develop_dl_bugfix_0723

parents 4d893d32 6ed31d40
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
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
View file @ 3b6f2b34
...@@ -266,14 +266,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -266,14 +266,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
private List<OrgMenuDto> doIsOnlineData(List<OrgMenuDto> list) { private List<OrgMenuDto> doIsOnlineData(List<OrgMenuDto> list) {
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
for (OrgMenuDto orgMenuDto : list) { for (OrgMenuDto orgMenuDto : list) {
orgMenuDto.setIsOnline(Boolean.TRUE); if (orgMenuDto.getBizOrgCode().length() == 12) {
if (orgMenuDto.getBizOrgCode().length() == 12 && CollectionUtils.isNotEmpty(orgMenuDto.getChildren())) { orgMenuDto.setIsOnline(Boolean.TRUE);
Set<Boolean> collect = orgMenuDto.getChildren().stream().map(OrgMenuDto::getIsOnline).collect(Collectors.toSet()); if (CollectionUtils.isNotEmpty(orgMenuDto.getChildren())) {
if (CollectionUtils.isEmpty(collect) || (collect.contains(Boolean.FALSE) && !collect.contains(Boolean.TRUE))) { Set<Boolean> collect = orgMenuDto.getChildren().stream().map(OrgMenuDto::getIsOnline).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(collect) || (collect.contains(Boolean.FALSE) && !collect.contains(Boolean.TRUE))) {
orgMenuDto.setIsOnline(Boolean.FALSE);
}
} else if (CollectionUtils.isEmpty(orgMenuDto.getChildren())) {
orgMenuDto.setIsOnline(Boolean.FALSE); orgMenuDto.setIsOnline(Boolean.FALSE);
} }
} else if (CollectionUtils.isEmpty(orgMenuDto.getChildren())) { } else if (orgMenuDto.getBizOrgCode().length() == 6) {
orgMenuDto.setIsOnline(Boolean.FALSE); orgMenuDto.setIsOnline(Boolean.TRUE);
} }
doIsOnlineData(orgMenuDto.getChildren()); doIsOnlineData(orgMenuDto.getChildren());
} }
......
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