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

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

diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index d8b2ecc..0cb1078 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -8,6 +8,7 @@
 import com.dg.core.db.gen.entity.SysUser;
 import com.dg.core.service.IOrganizationChartService;
 import com.dg.core.service.IReplyTemplateService;
+import com.dg.core.util.PermissionUtil;
 import com.dg.core.util.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,7 +44,11 @@
                                           @CurrentUser SysUser sysUser)
     {
         Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
-        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        if(ids==null || ids.size()<1)
+        {
+            return getDataTable("您没有权限查看该数据");
+        }
         List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
         int num=iReplyTemplateService.countNum(Name,ids);
         return getDataTable(list,num);

--
Gitblit v1.7.1