提交代码

backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatQuestionServiceImpl.java

@@ -73,7 +73,39 @@ public class HqSatQuestionServiceImpl implements IHqSatQuestionService {
     private LambdaQueryWrapper<HqSatQuestion> buildQueryWrapper(HqSatQuestionBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<HqSatQuestion> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(HqSatQuestion::getId);
+
+        // 处理排序参数
+        if (params != null && params.containsKey("orderByColumn") && params.containsKey("isAsc")) {
+            String orderByColumn = (String) params.get("orderByColumn");
+            String isAsc = (String) params.get("isAsc");
+
+            if ("createTime".equals(orderByColumn)) {
+                if ("desc".equals(isAsc)) {
+                    lqw.orderByDesc(HqSatQuestion::getCreateTime);
+                } else {
+                    lqw.orderByAsc(HqSatQuestion::getCreateTime);
+                }
+            } else if ("updateTime".equals(orderByColumn)) {
+                if ("desc".equals(isAsc)) {
+                    lqw.orderByDesc(HqSatQuestion::getUpdateTime);
+                } else {
+                    lqw.orderByAsc(HqSatQuestion::getUpdateTime);
+                }
+            } else if ("sortOrder".equals(orderByColumn)) {
+                if ("desc".equals(isAsc)) {
+                    lqw.orderByDesc(HqSatQuestion::getSortOrder);
+                } else {
+                    lqw.orderByAsc(HqSatQuestion::getSortOrder);
+                }
+            } else {
+                // 默认按创建时间倒序
+                lqw.orderByDesc(HqSatQuestion::getCreateTime);
+            }
+        } else {
+            // 默认按创建时间倒序
+            lqw.orderByDesc(HqSatQuestion::getCreateTime);
+        }
+
         // 添加ID查询条件
         lqw.eq(bo.getId() != null, HqSatQuestion::getId, bo.getId());
         lqw.eq(bo.getDeleted() != null, HqSatQuestion::getDeleted, bo.getDeleted());

backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqPmRepairOrderMapper.xml

@@ -15,11 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
         INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
         INNER JOIN sys_role r ON ur.role_id = r.role_id
-        WHERE (r.role_key = 'maintenance_worker'
-           OR r.role_name = '维修人员'
-           OR r.role_id = 5
-           OR r.role_name LIKE '%维修%'
-           OR r.role_key LIKE '%worker%')
+        WHERE r.role_key = 'maintenance_worker'
         AND u.status = '0'
         AND u.del_flag = '0'
         ORDER BY u.user_id