From 23fd3f969d2e35c40742b6cd69a24ddf0195732a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 15:25:07 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
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..52fea61 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
@@ -333,16 +333,6 @@
}
public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
-// LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
-// if (StrUtil.isNotBlank(keyword)) {
-// wrapper.like(LightTask::getTaskName, keyword);
-// }
-// //涓嶆槸瓒呯闇�瑕佺瓫閫�
-// if (SecurityUtils.getClientId() != null) {
-// wrapper.eq(LightTask::getClientId, SecurityUtils.getUserId()).or(w -> {
-// w.eq(LightTask::getUserId, SecurityUtils.getUserId());
-// });
-// }
//鎺掑簭瀛楁
String orderByResult = "task_id";
@@ -372,7 +362,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