KPI / fw-morax

Commit 04d2c628a1fab1601eede6f1521a024417d53916

Authored by 张志伟
2 parents f31f5c81 4ba9c650

Merge branch 'main-bug' into 'main' 

feature(bug):  排名报错处理

排名报错处理

See merge request !72
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiIndicatorRankStaffVO.java
  View file @04d2c62
... ... @@ -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));
... ...