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 | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 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 ee22da9..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
@@ -2,8 +2,13 @@
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;
@@ -22,6 +27,8 @@
@Autowired
IElseAccessoryService iElseAccessoryService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 获取附件列表
@@ -32,13 +39,20 @@
*/
@ApiOperation("获取附件列表接口")
@GetMapping(path = "/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<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);
}
@@ -49,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);
}
@@ -64,6 +85,7 @@
*/
@ApiOperation("新增附件")
@PostMapping(path = "/add")
+ @Authorization
public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
{
if(entity==null)
@@ -96,6 +118,7 @@
*/
@ApiOperation("更新附件")
@PostMapping(path = "/update")
+ @Authorization
public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity)
{
return toAjax(iElseAccessoryService.updateConfig(entity));
@@ -108,6 +131,7 @@
*/
@ApiOperation("删除附件")
@DeleteMapping(path = "/delete")
+ @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
return toAjax(iElseAccessoryService.deleteConfigById(Id));
--
Gitblit v1.7.1