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/AutomessagePolicyDocumentsController.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java index 48eb4f4..f085289 100644 --- a/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java +++ b/flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java @@ -7,12 +7,14 @@ import com.dg.core.db.gen.entity.AutomessagePolicyDocuments; import com.dg.core.db.gen.entity.SysUser; import com.dg.core.service.IAutomessagePolicyDocumentsService; +import com.dg.core.service.IOrganizationChartService; import com.dg.core.util.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,6 +28,9 @@ @Resource private IAutomessagePolicyDocumentsService iAutomessagePolicyDocumentsService; + @Resource + private IOrganizationChartService iOrganizationChartService; + /** * 获取法律法规政策文件列表(分页) * @param name @@ -37,7 +42,6 @@ @ApiImplicitParam(name = "type", value = "类型(1.法律法规2.政策文件)", required = true, dataType = "String", paramType = "query") }) @GetMapping("/selectConfigList") - @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, @@ -45,8 +49,12 @@ @RequestParam(value = "departmentId",required = false) Integer departmentId, @CurrentUser SysUser sysUser){ Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize); - List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId); - return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId)); + List<String> ids=null; + if (sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){ + ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId()); + } + List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId,ids); + return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId,ids)); } /** @@ -63,7 +71,7 @@ public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name, @RequestParam(value = "type",required = false) String type, @RequestParam(value = "departmentId",required = false) Integer departmentId){ - List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId); + List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null); return ResultData.success(list); } @@ -129,7 +137,6 @@ */ @ApiOperation(value = " 根据id获取法律法规政策文件数据 ",response = AutomessagePolicyDocuments.class) @GetMapping("/selectAutomessagePolicyDocumentById") - @Authorization public ResultData selectAutomessagePolicyDocumentById(@RequestParam(value = "id") Integer id){ AutomessagePolicyDocuments automessagePolicyDocuments = iAutomessagePolicyDocumentsService.selectAutomessagePolicyDocumentById(id); if (automessagePolicyDocuments!=null){ -- Gitblit v1.7.1