diff --git a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java index 6de7c4b..f439770 100644 --- a/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java +++ b/pms-business/src/main/java/tech/unissense/pms/business/examine/user/domain/ExamineUser.java @@ -67,7 +67,8 @@ public class ExamineUser extends BaseEntity { if (StrUtil.isEmpty(sortFiled)) { return null; } else if ("all".equalsIgnoreCase(sortFiled)) { - return (StrUtil.format("order by IFNULL(score,ifnull(manage_score,ifnull(self_score,-1))) {}", StrUtil.isNotEmpty(isAsc) ? isAsc : "")); + //评分排序规则 总分->主管评分(需主管提交)->个人评分(需个人提交) + return (StrUtil.format("order by IFNULL(score,if(examine_status=1,manage_score,if(examine_status_self=1,ifnull(self_score,-1),-1))) {}", StrUtil.isNotEmpty(isAsc) ? isAsc : "")); } else if ("manageScore".equalsIgnoreCase(sortFiled)) { return (StrUtil.format("order by ifnull(manage_score,-1) {}", StrUtil.isNotEmpty(isAsc) ? isAsc : "")); } else if ("selfScore".equalsIgnoreCase(sortFiled)) {