Commit 94675d9919eccdd421dfd1a58f2849e35bda8086
1 parent
f49aba31
feature(*): 筛选修改
筛选修改
Showing
1 changed file
with
2 additions
and
2 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/kpi/CombineIndicatorBizService.java
... | ... | @@ -69,7 +69,7 @@ public class CombineIndicatorBizService { |
69 | 69 | public List<CombineAndEvalIndicatorVO> combineAndEvalIndicators(CombineIndicatorQueryDTO dto) { |
70 | 70 | |
71 | 71 | List<CombineAndEvalIndicatorVO> combineAndEvalIndicatorVOS = Lists.newArrayListWithCapacity(100); |
72 | - if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) { | |
72 | + if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) { | |
73 | 73 | List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery() |
74 | 74 | .eq(PublicUtil.isNotEmpty(dto.getSysId()), EvalIndicator::getSysId, dto.getSysId()) |
75 | 75 | .eq(PublicUtil.isNotEmpty(dto.getRoleCode()), EvalIndicator::getRoleCode, dto.getRoleCode()) |
... | ... | @@ -100,7 +100,7 @@ public class CombineIndicatorBizService { |
100 | 100 | return combineAndEvalIndicatorVOS; |
101 | 101 | } |
102 | 102 | |
103 | - if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.TRUE.equals(dto.getCombineIndicator())) { | |
103 | + if (PublicUtil.isEmpty(dto.getCombineIndicator()) || Boolean.FALSE.equals(dto.getCombineIndicator())) { | |
104 | 104 | List<CombineIndicator> combineIndicators = combineIndicatorService.list(Wrappers.<CombineIndicator>lambdaQuery() |
105 | 105 | .eq(CombineIndicator::getGroupId, dto.getGroupId()) |
106 | 106 | .eq(PublicUtil.isNotEmpty(dto.getEnable()), CombineIndicator::getEnable, dto.getEnable()) | ... | ... |