From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 12 ++++--------
1 files changed, 4 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 0cb1078..489c5d6 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,11 +44,7 @@
@CurrentUser SysUser sysUser)
{
Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
- List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
- if(ids==null || ids.size()<1)
- {
- return getDataTable("您没有权限查看该数据");
- }
+ 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);
@@ -91,12 +87,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 +101,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