From ad95de03f14c19d548f06a79f2496f15c957b6c5 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:07:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index 251bf38..9755113 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -95,12 +95,16 @@
if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo
-// return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword));
- if (SecurityUtils.getClientId() == null) {
- LambdaQueryWrapper<IpVolumeMission> like = Wrappers.lambdaQuery(IpVolumeMission.class).like(IpVolumeMission::getMissionName, keyword);
- return ResponseUtil.successPage(ipVolumeMissionService.list(like));
- }
+
+
+// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo
+//// return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword));
+// if (SecurityUtils.getClientId() == null) {
+// LambdaQueryWrapper<IpVolumeMission> like = Wrappers.lambdaQuery(IpVolumeMission.class).like(IpVolumeMission::getMissionName, keyword);
+// return ResponseUtil.successPage(ipVolumeMissionService.list(like));
+// }
+
+
return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
}
--
Gitblit v1.9.3