From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +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, 4 insertions(+), 3 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 fb1fc73..2b1a29a 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
@@ -46,11 +46,12 @@
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ReplyTemplateEntity> list;
- if (sysUser.getUserType().equals("2")){
- list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());}
- else {
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
}
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
+ }
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1