From 426718fb2310abff70f54962f118f4300ead2408 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期日, 12 一月 2025 11:30:59 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao into 2.0.1
---
server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
index 31a8596..69583a5 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -153,6 +153,7 @@
boolean depart=false;
boolean departAndLeaf=false;
boolean custom=false;
+ boolean self=false;
String c = "";
for(SystemDataPermissionListVO d : list){
if(!all && Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.all)){
@@ -171,6 +172,9 @@
custom =true;
c += StringUtils.defaultString(d.getCustomData(),"");
}
+ if( Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.self)){
+ self =true;
+ }
}
CompanyDepartment department = new CompanyDepartment();
department.setId(user.getDepartmentId());
@@ -185,6 +189,8 @@
if(all){
return null;
+ }else if(self){
+ return new ArrayList<>();
}else{
List<Integer> dList = new ArrayList<>();
dList.add(-1);//铏氭嫙閮ㄩ棬锛屾帓鏌ョ┖闆嗗悎
--
Gitblit v1.9.3