From 18e9c3c8c5c05fb14b13d2a30a69af0165496f33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 17:46:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
index a62e6f6..c96a1a1 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java
@@ -189,13 +189,17 @@
custom =true;
c += StringUtils.defaultString(d.getCustomData(),"");
}
+
+ }
+ if(!all &&!departAndChild&& !depart && !departAndLeaf && !custom ){
+ return new ArrayList<>();
}
Company department = new Company();
department.setId(user.getCompanyId());
if(all){
return null;
- }else{
+ } else{
List<Integer> dList = new ArrayList<>();
dList.add(-1);//铏氭嫙閮ㄩ棬锛屾帓鏌ョ┖闆嗗悎
if(custom) {
--
Gitblit v1.9.3