From 0f28c38f1a978a47b8221dff56eeebf26a9e6fac Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 20 十月 2022 14:39:36 +0800
Subject: [PATCH] 修改bug

---
 flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 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 0564736..fe90412 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
@@ -6,10 +6,13 @@
 import com.dg.core.annotation.CurrentUser;
 import com.dg.core.db.gen.entity.ReplyTemplateEntity;
 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;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,19 +27,30 @@
     @Autowired
     IReplyTemplateService iReplyTemplateService;
 
+    @Autowired
+    IOrganizationChartService iOrganizationChartService;
+
+
     /**
      * 获取模板列表
      * @return
      */
     @ApiOperation("获取模板列表")
     @GetMapping("/getlist")
+    @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<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name);
-        int num=iReplyTemplateService.countNum(Name);
+        List<String> ids= PermissionUtil.getPermission(sysUser);
+        if(ids==null || ids.size()<1)
+        {
+            return getDataTable("您没有权限查看该数据");
+        }
+        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
+        int num=iReplyTemplateService.countNum(Name,ids);
         return getDataTable(list,num);
     }
 
@@ -47,6 +61,7 @@
      */
     @ApiOperation("获取详情")
     @GetMapping("/getdata")
+    @Authorization
     public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id)
     {
         if(StringUtils.isEmpty(Id))
@@ -76,6 +91,19 @@
             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()+"");
@@ -90,6 +118,7 @@
      */
     @ApiOperation("更新模板")
     @PostMapping("/update")
+    @Authorization
     public ResultData updateConfig(@RequestBody ReplyTemplateEntity entity)
     {
         if(entity==null)
@@ -111,6 +140,7 @@
      */
     @ApiOperation("删除模板")
     @DeleteMapping("/delete")
+    @Authorization
     public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
     {
         return toAjax(iReplyTemplateService.deleteConfigById(Id));
@@ -124,6 +154,7 @@
      */
     @ApiOperation("复制模板")
     @PostMapping("/copy")
+    @Authorization
     public ResultData copy(@RequestParam(value = "Id",required = false) String Id)
     {
         if(StringUtils.isEmpty(Id))
@@ -137,6 +168,7 @@
         {
             return ResultData.error("模板不存在！");
         }
+        entity.setName(entity.getName()+"(副本)");
         entity.setId(null);
         return toAjax(iReplyTemplateService.insertConfig(entity));
     }

--
Gitblit v1.7.1