From 087cdd047c26b4dba4efc61c8f873b3afcb552d4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 14:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
index 7f83665..c675fde 100644
--- a/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/ElseAccessoryAppletsController.java
@@ -10,6 +10,7 @@
 import com.dg.core.db.gen.entity.SysUser;
 import com.dg.core.service.IElseAccessoryService;
 import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
 import com.dg.core.util.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,7 +43,11 @@
     public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
                                              @CurrentUser SysUser sysUser)
     {
-        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        if(ids==null || ids.size()<1)
+        {
+            return getDataTable("您没有权限查看该数据");
+        }
         List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
         int num=iElseAccessoryService.countNum(Name,ids);
         return getDataTable(list,num);

--
Gitblit v1.7.1