|
@@ -1594,7 +1594,24 @@ public class StoreStaffConfigServiceImpl implements StoreStaffConfigService {
|
|
|
titleStaffList.add(staff);
|
|
titleStaffList.add(staff);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- titleStaffList.sort((x,y)->y.getTopTime().compareTo(x.getTopTime()));
|
|
|
|
|
|
|
+ titleStaffList.sort((x, y) -> {
|
|
|
|
|
+ // 获取两个对象的topTime
|
|
|
|
|
+ Date xTime = x.getTopTime();
|
|
|
|
|
+ Date yTime = y.getTopTime();
|
|
|
|
|
+
|
|
|
|
|
+ // 处理null值的情况
|
|
|
|
|
+ if (xTime == null && yTime == null) {
|
|
|
|
|
+ return 0; // 两个都为null,视为相等
|
|
|
|
|
+ }
|
|
|
|
|
+ if (xTime == null) {
|
|
|
|
|
+ return 1; // x为null,排到后面(y在前)
|
|
|
|
|
+ }
|
|
|
|
|
+ if (yTime == null) {
|
|
|
|
|
+ return -1; // y为null,排到后面(x在前)
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 都不为null时,正常比较(按时间降序)
|
|
|
|
|
+ return yTime.compareTo(xTime);});
|
|
|
groupVo.setStaffList(titleStaffList);
|
|
groupVo.setStaffList(titleStaffList);
|
|
|
result.add(groupVo);
|
|
result.add(groupVo);
|
|
|
}
|
|
}
|