diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml index 6139f56..3896b81 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml @@ -413,6 +413,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY cd.id ORDER BY + -- 实现自定义状态排序:审核中(2) > 已驳回(1) > 已通过(0) + CASE cd.review_status + WHEN 2 THEN 1 -- 已驳回 -> 排序值为 0 + WHEN 1 THEN 2 -- 已通过 -> 排序值为 2 + WHEN 0 THEN 0 -- 待审核 -> 排序值为 1 + ELSE 3 -- 其他状态排在最后 + END ASC, + -- 按申请时间降序排序(后申请的在前) cd.create_time DESC diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index d0e312e..18baa36 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -454,29 +454,29 @@