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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 fe90412..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
@@ -44,12 +44,14 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
+ List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+ List<ReplyTemplateEntity> list;
+ if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
}
- List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+ else {
+ list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,sysUser.getUserId());
+ }
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -91,12 +93,12 @@
return ResultData.error("模板名称不能为空");
}
- if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+ if(StringUtils.isEmpty(entity.getDepartmentId()))
{
return ResultData.error("部门id不能为空 请分配部门id");
}
- List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(entity.getDepartmentId());
int num=iReplyTemplateService.countNum(entity.getName(),ids);
if(num>0)
@@ -105,7 +107,7 @@
}
entity.setId(null);
- entity.setDepartmentId(sysUser.getDepartmentId());
+ entity.setDepartmentId(entity.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
return toAjax(iReplyTemplateService.insertConfig(entity));
--
Gitblit v1.7.1