From 25467e37012939fb621ee6e43edc2587ba48dc63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:16:20 +0800
Subject: [PATCH] 广播素材列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 9 ---------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 27 ++++++++++-----------------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java | 5 +++++
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 5242cd1..62432bc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -55,10 +55,15 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
+
+
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
/* if (null != keyword) {
wrapper.like(IpVolumeFile::getFileName, keyword);
}*/
+
+
+
return ResponseUtil.success(ipVolumeFileService.list(wrapper));
}
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 9755113..c08915a 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
@@ -96,15 +96,6 @@
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));
-// }
-
-
return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index 537f359..d982abd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -73,27 +73,20 @@
public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<IpVolumeFile> wrapper;
+ LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
- if (SecurityUtils.getClientId() == null) {
- wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);
- } else {
- if (clientService.findClientId()) {
- wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
- } else {
- wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId())
- .or(file -> {
- file.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId());
- });
- }
+ //涓嶆槸瓒呯
+ if (SecurityUtils.getClientId() != null) {
+ wrapper = wrapper.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId())
+ .or(file -> {
+ file.eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
+ });
}
-
- if (keyword.isEmpty()) {
- return wrapper;
- } else {
- return wrapper.like(IpVolumeFile::getFileName, keyword);
+ if (!keyword.isEmpty()) {
+ wrapper.like(IpVolumeFile::getFileName, keyword);
}
+ return wrapper;
}
--
Gitblit v1.9.3