Commit 9b8aeb28d3471185ec0bc66eb876791d716694ce

Authored by 姜超
2 parents 04d2c628 c1af0cac

Merge branch 'main-bug' into main

fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/kpi/KpiIndicatorRankStaffVO.java
... ... @@ -85,10 +85,10 @@ public class KpiIndicatorRankStaffVO implements Comparable<KpiIndicatorRankStaff
85 85 @Override
86 86 public int compareTo(KpiIndicatorRankStaffVO other) {
87 87 if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) {
88   - return 1;
  88 + return -1;
89 89 }
90 90 if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) {
91   - return - 1;
  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));
... ...