From 93e84d0d767cd52593b058100c528fc9b5ec0a8c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 13:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/util/PermissionUtil.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
index 8c489ee..67271d7 100644
--- a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
@@ -46,7 +46,8 @@
         else if(StringUtils.equals("1", sysUser.getUserType()))
         {
             //管理员
-            List<String> ids=iOrganizationChartService.getIds("");
+//            List<String> ids=iOrganizationChartService.getIds("");
+            List<String> ids=null;
             return ids;
         }
         else

--
Gitblit v1.7.1