From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..b8da591 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
@@ -370,7 +370,7 @@
//鎺掑簭瀛楁
- String orderByResult = "id";
+ String orderByResult = "task_id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = "ASC";
if (order != null) {
@@ -395,12 +395,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 +437,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