From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 11:27:47 +0800 Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整 --- flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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..e8e2838 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,13 @@ @CurrentUser SysUser sysUser) { Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize); - List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService); + List<String> ids=PermissionUtil.getStairDepartment(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); @@ -156,7 +157,7 @@ @ApiOperation("复制模板") @PostMapping("/copy") @Authorization - public ResultData copy(@RequestParam(value = "Id",required = false) String Id) + public ResultData copy(@RequestParam(value = "Id",required = false) String Id,@CurrentUser SysUser sysUser) { if(StringUtils.isEmpty(Id)) { @@ -169,6 +170,7 @@ { return ResultData.error("模板不存在!"); } + entity.setCreateUserId(sysUser.getUserId()); entity.setName(entity.getName()+"(副本)"); entity.setId(null); return toAjax(iReplyTemplateService.insertConfig(entity)); -- Gitblit v1.7.1