dev
parent
5965d35fd3
commit
bac5d19a49
|
|
@ -323,8 +323,9 @@ public class BizAuditConfigService extends ServiceImpl<BizAuditConfigMapper, Biz
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
List<BizAuditConfigEntity> areaList = list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles));
|
List<BizAuditConfigEntity> areaList = list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles));
|
||||||
|
List<String> areas = areaList.stream().map(BizAuditConfigEntity::getArea).collect(Collectors.toList());
|
||||||
List<BizAuditConfigEntity> cityList = list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles)
|
List<BizAuditConfigEntity> cityList = list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles)
|
||||||
.notIn(BizAuditConfigEntity::getArea, areaList.stream().map(BizAuditConfigEntity::getArea).collect(Collectors.toList())));
|
.notIn(CollUtil.isNotEmpty(areas), BizAuditConfigEntity::getArea, areas));
|
||||||
all = Stream.of(areaList, cityList)
|
all = Stream.of(areaList, cityList)
|
||||||
.flatMap(Collection::stream)
|
.flatMap(Collection::stream)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue