From 4040856595952ea0b8f8b764ba2770d5c244c891 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221010
---
flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 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 ebc7968..7cb1f51 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,12 +2,16 @@
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.util.StringUtils;
+import com.dg.core.service.IOrganizationChartService;
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.*;
@@ -22,6 +26,8 @@
@Autowired
IElseAccessoryService iElseAccessoryService;
+ @Autowired
+ IOrganizationChartService iOrganizationChartService;
/**
* 获取附件列表
@@ -32,13 +38,16 @@
*/
@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=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name,ids);
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -49,10 +58,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=iOrganizationChartService.getIds(sysUser.getDepartmentId());
+ List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(Name,ids);
+ int num=iElseAccessoryService.countNum(Name,ids);
return getDataTable(list,num);
}
@@ -64,6 +76,7 @@
*/
@ApiOperation("新增附件")
@PostMapping(path = "/add")
+ @Authorization
public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity)
{
if(entity==null)
@@ -96,6 +109,7 @@
*/
@ApiOperation("更新附件")
@PostMapping(path = "/update")
+ @Authorization
public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity)
{
return toAjax(iElseAccessoryService.updateConfig(entity));
@@ -108,6 +122,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