From e610dbf131729194519ae1ebb63f4c4d613c41a0 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Mon, 11 Nov 2024 17:09:33 +0800
Subject: [PATCH] 修改权限逻辑
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index 35b18c0..1563306 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -82,11 +82,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -125,11 +126,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -589,11 +591,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -736,11 +739,12 @@
List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -781,8 +785,9 @@
searchDTO.setCountryUnit(longList);
}
- if(roleId==1800818489547112450L){
+ if(roleId.equals(1800818489547112450L)){
searchDTO.setSelfUnit(longList);
+
}
}
}
--
Gitblit v1.9.3