Commit 4ba9c65037abd9b46cae2ef828d2aa7be1942668

Authored by 姜超
1 parent f31f5c81

feature(bug): 排名报错处理

排名报错处理
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiIndicatorRankStaffVO.java
... ... @@ -84,11 +84,11 @@ public class KpiIndicatorRankStaffVO implements Comparable<KpiIndicatorRankStaff
84 84  
85 85 @Override
86 86 public int compareTo(KpiIndicatorRankStaffVO other) {
87   - if (! this.inclusion) {
  87 + if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) {
88 88 return 1;
89 89 }
90   - if (! other.inclusion) {
91   - return -1;
  90 + if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) {
  91 + return - 1;
92 92 }
93 93 return Optional.ofNullable(other.originValue).orElse(BigDecimal.ZERO)
94 94 .compareTo(Optional.ofNullable(this.originValue).orElse(BigDecimal.ZERO));
... ...