From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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..6b62820 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,6 +27,8 @@
@Autowired
IElseAccessoryService iElseAccessoryService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 获取附件列表
@@ -36,11 +42,17 @@
@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);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids);
+ int num=iElseAccessoryService.countNum(name,ids);
return getDataTable(list,num);
}
@@ -51,10 +63,17 @@
*/
@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);
+ if(ids==null || ids.size()<1)
+ {
+ return getDataTable("您没有权限查看该数据");
+ }
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
--
Gitblit v1.7.1