From 350608105f300c6c629d743dc9896feca2f22e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 16:11:49 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 a11cabd..3ba73ec 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
@@ -49,6 +49,18 @@
public boolean addMission(IpVolumeMissionParam missionparam) {
+ List<Integer> fileIds = missionparam.getFileIds();
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listByIds(fileIds);
+ ipVolumeFiles.forEach(file -> {
+ if (SecurityUtils.getClientId() != null) {
+ //闈炶秴绠＄敤鎴�
+ if (!SecurityUtils.getUserId().equals(file.getClientId()) && !SecurityUtils.getUserId().equals(file.getUserId())) {
+ //鐢ㄦ埛id鍜屽鎴穒d閮戒笉鍖归厤
+ throw new BusinessException("鏂囦欢褰掑睘寮傚父,鍒涘缓浠诲姟澶辫触");
+ }
+ }
+ });
+
String taskName = missionparam.getMissionName();
if (null == taskName || "".equals(taskName)) {
@@ -103,7 +115,7 @@
MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
fileEntity.getFileName()
);
- if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
+ if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
absolutePath = MinIoConstant.getAbsolutePath(
MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
fileEntity.getFileName()
@@ -370,7 +382,7 @@
//鎺掑簭瀛楁
- String orderByResult = "id";
+ String orderByResult = "task_id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = "ASC";
if (order != null) {
@@ -395,12 +407,14 @@
}
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
//涓嶆槸瓒呯
if (SecurityUtils.getClientId() != null) {
eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
@@ -435,12 +449,12 @@
}
if (SecurityUtils.getClientId() != null) {
if (clientService.findClientId()) {
- if (byId.getUserId().equals(SecurityUtils.getUserId())) {
+ if (!byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
} else {
- if (byId.getClientId().equals(SecurityUtils.getUserId())) {
+ if (!byId.getClientId().equals(SecurityUtils.getUserId()) && !byId.getUserId().equals(SecurityUtils.getUserId())) {
throw new BusinessException("浠诲姟褰掑睘閿欒");
}
}
--
Gitblit v1.9.3