From 19b96e1b86b3ffd8a75de1bcf95bcbce85fb36e8 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期三, 23 十一月 2022 18:21:32 +0800 Subject: [PATCH] 其他附件管理列表接口新增 创建人字段 --- flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 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 7c03e08..56f613d 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,11 +2,17 @@ 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; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,23 +27,34 @@ @Autowired IElseAccessoryService iElseAccessoryService; + @Autowired + IOrganizationChartService iOrganizationChartService; /** * 获取附件列表 * @param pageNum * @param pageSize - * @param Name + * @param name * @return */ @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.getStairDepartment(sysUser,iOrganizationChartService); + List<ElseAccessoryEntity> list; + if (sysUser.getUserType().equals("1")||sysUser.getIsDivisionHead().equals("1")){ + list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,null); + } + else { + list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids,sysUser.getUserId()); + } + int num=iElseAccessoryService.countNum(name,ids); return getDataTable(list,num); } @@ -48,10 +65,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,sysUser.getUserId()); + int num=iElseAccessoryService.countNum(Name,ids); return getDataTable(list,num); } @@ -63,7 +83,8 @@ */ @ApiOperation("新增附件") @PostMapping(path = "/add") - public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity) + @Authorization + public ResultData insertConfig(@RequestBody ElseAccessoryEntity entity,@CurrentUser SysUser sysUser) { if(entity==null) { @@ -84,7 +105,7 @@ { return ResultData.error("部门不能为空"); } - + entity.setCreateUserId(sysUser.getUserId()); return toAjax(iElseAccessoryService.insertConfig(entity)); } @@ -95,6 +116,7 @@ */ @ApiOperation("更新附件") @PostMapping(path = "/update") + @Authorization public ResultData updateConfig(@RequestBody ElseAccessoryEntity entity) { return toAjax(iElseAccessoryService.updateConfig(entity)); @@ -107,6 +129,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