From f0e82623c9b60b17210da35deec49d27f79c1383 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 16:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 12 +++++++++++-
1 files changed, 11 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 7bd2b3d..6be56ea 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
@@ -44,6 +44,17 @@
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ String[] roles = sysUser.getRoleIds().split(",");
+ Integer isRole=0;//是否超管
+ for (String role: roles) {
+ if (role.equals("1")){
+ isRole=1;
+ break;
+ }
+ }
+ if (isRole.equals(1)){
+ ids=null;
+ }
List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
@@ -85,7 +96,6 @@
{
return ResultData.error("模板名称不能为空");
}
-
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
--
Gitblit v1.7.1