From 78c7b03e279cad29a6123e83da738edc1f00280c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:55:41 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 2 +-
dao/src/main/resources/mapper/LightTaskMapper.xml | 4 ++--
dao/src/main/java/com/sandu/ximon/dao/mapper/LightTaskMapper.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightTaskMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightTaskMapper.java
index 87f8c42..e01c39c 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/LightTaskMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/LightTaskMapper.java
@@ -21,7 +21,7 @@
Integer toTalCount(Long taskId);
- List<LightTask> listTask(Long userId , String keyword);
+ List<LightTask> listTask(Long userId , String keyword, String orderBy);
}
diff --git a/dao/src/main/resources/mapper/LightTaskMapper.xml b/dao/src/main/resources/mapper/LightTaskMapper.xml
index 4b3a944..cc8efe4 100644
--- a/dao/src/main/resources/mapper/LightTaskMapper.xml
+++ b/dao/src/main/resources/mapper/LightTaskMapper.xml
@@ -97,7 +97,7 @@
</if>
GROUP BY
task_id
--- ORDER BY
--- t1.${orderBy}
+ ORDER BY
+ t1.${orderBy}
</select>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index bc4b038..194c366 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -372,7 +372,7 @@
String orderBy = orderByResult + " " + orderBySeq;
PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
- List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword);
+ List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
Page<LightTaskDto> page = new Page<>();
--
Gitblit v1.9.3