From 9bbe23024b988c44abcaeb81f725ad3d13a42fc0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 08 十一月 2022 16:26:06 +0800
Subject: [PATCH] 办事指南导入功能

---
 flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
index c992dba..fe33a4d 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java
@@ -3,8 +3,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dg.core.ResultData;
 import com.dg.core.annotation.Authorization;
+import com.dg.core.annotation.CurrentUser;
 import com.dg.core.db.gen.entity.ElseAccessoryEntity;
+import com.dg.core.db.gen.entity.SysUser;
 import com.dg.core.service.IElseAccessoryService;
+import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.util.PermissionUtil;
 import com.dg.core.util.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,12 +27,14 @@
     @Autowired
     IElseAccessoryService iElseAccessoryService;
 
+    @Autowired
+    IOrganizationChartService iOrganizationChartService;
 
     /**
      * 获取附件列表
      * @param pageNum
      * @param pageSize
-     * @param Name
+     * @param name
      * @return
      */
     @ApiOperation("获取附件列表接口")
@@ -36,11 +42,13 @@
     @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<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize);
-        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name);
-        int num=iElseAccessoryService.countNum(Name);
+        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+        int num=iElseAccessoryService.countNum(name,ids);
         return getDataTable(list,num);
     }
 
@@ -51,10 +59,13 @@
      */
     @ApiOperation("获取附件列表接口(全部)")
     @GetMapping(path = "/getAllList")
-    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name)
+    @Authorization
+    public TableDataInfo selectConfigListAll(@RequestParam(value = "Name",required = false) String Name,
+                                             @CurrentUser SysUser sysUser)
     {
-        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name);
-        int num=iElseAccessoryService.countNum(Name);
+        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+        int num=iElseAccessoryService.countNum(Name,ids);
         return getDataTable(list,num);
     }
 

--
Gitblit v1.7.1