From 48d0d99b47fadd9ff2a09f60bf5d35f694d11e21 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 25 十月 2022 09:31:45 +0800
Subject: [PATCH] 修改导办管理显示 bug
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 6be56ea..618272d 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;
@@ -39,22 +40,11 @@
@Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize,
- @RequestParam(value = "Name",required = false) String Name,
+ @RequestParam(value = "name",required = false) String Name,
@CurrentUser SysUser sysUser)
{
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<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
int num=iReplyTemplateService.countNum(Name,ids);
return getDataTable(list,num);
@@ -96,6 +86,20 @@
{
return ResultData.error("模板名称不能为空");
}
+
+ if(StringUtils.isEmpty(sysUser.getDepartmentId()))
+ {
+ return ResultData.error("部门id不能为空 请分配部门id");
+ }
+
+ List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ int num=iReplyTemplateService.countNum(entity.getName(),ids);
+
+ if(num>0)
+ {
+ return ResultData.error("部门里办事名称重复！");
+ }
+
entity.setId(null);
entity.setDepartmentId(sysUser.getDepartmentId());
entity.setCreateUserId(sysUser.getUserId()+"");
@@ -160,6 +164,7 @@
{
return ResultData.error("模板不存在！");
}
+ entity.setName(entity.getName()+"(副本)");
entity.setId(null);
return toAjax(iReplyTemplateService.insertConfig(entity));
}
--
Gitblit v1.7.1