From 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:06:42 +0800
Subject: [PATCH] IP音柱任务列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index c5eb375..af2b08a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -333,25 +333,22 @@
public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
- // PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- boolean r = clientService.findClientId(); //ture浠ｈ〃鏈変笂绾у鎴� 鏌ヨ閫氳繃userID
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
- LambdaQueryWrapper<IpVolumeMission> eq = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- if (r) {
- eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
- } else {
- eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
+ //涓嶆槸瓒呯
+ if (SecurityUtils.getClientId() != null) {
+ eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
+ });
}
if (!keyword.isEmpty()) {
eq.like(IpVolumeMission::getMissionName, keyword);
}
List<IpVolumeMission> list = list(eq);
-
-
- // ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
for (IpVolumeMission mission : list) {
List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
@@ -359,16 +356,9 @@
BeanUtils.copyProperties(mission, bo);
bo.setFileNames(fileName);
ipVolumeMissionBos.add(bo);
-
}
-// for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
-// missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
-//
-// }
-
return ipVolumeMissionBos;
- //return new ArrayList<>();
}
public TaskVO getByTaskId(Integer taskId) {
@@ -383,12 +373,12 @@
}
if (SecurityUtils.getClientId() != null) {
if (clientService.findClientId()) {
- if (byId.getUserId() != SecurityUtils.getUserId()) {
+ if (byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
} else {
- if (byId.getClientId() != SecurityUtils.getUserId()) {
+ if (byId.getClientId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
}
@@ -402,7 +392,6 @@
.eq(BroadcastV2TaskFile::getTaskId, taskId));
List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
.eq(BroadcastV2TaskTerminal::getTaskId, taskId));
-
if (!taskFiles.isEmpty()) {
--
Gitblit v1.9.3