Commit 9b8aeb28d3471185ec0bc66eb876791d716694ce
Merge branch 'main-bug' into main
Showing
1 changed file
with
2 additions
and
2 deletions
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,10 +85,10 @@ public class KpiIndicatorRankStaffVO implements Comparable<KpiIndicatorRankStaff | ||
85 | @Override | 85 | @Override |
86 | public int compareTo(KpiIndicatorRankStaffVO other) { | 86 | public int compareTo(KpiIndicatorRankStaffVO other) { |
87 | if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) { | 87 | if (Boolean.TRUE.equals(this.inclusion) && Boolean.FALSE.equals(other.inclusion)) { |
88 | - return 1; | 88 | + return -1; |
89 | } | 89 | } |
90 | if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) { | 90 | if (Boolean.FALSE.equals(this.inclusion) && Boolean.TRUE.equals(other.inclusion)) { |
91 | - return - 1; | 91 | + return 1; |
92 | } | 92 | } |
93 | return Optional.ofNullable(other.originValue).orElse(BigDecimal.ZERO) | 93 | return Optional.ofNullable(other.originValue).orElse(BigDecimal.ZERO) |
94 | .compareTo(Optional.ofNullable(this.originValue).orElse(BigDecimal.ZERO)); | 94 | .compareTo(Optional.ofNullable(this.originValue).orElse(BigDecimal.ZERO)); |