From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 11:27:47 +0800 Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整 --- flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 f085289..ffb6bd2 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 @@ -39,7 +39,9 @@ */ @ApiOperation(value = "获取法律法规政策文件列表(分页)",response = AutomessagePolicyDocuments.class) @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型(1.法律法规2.政策文件)", required = true, dataType = "String", paramType = "query") + @ApiImplicitParam(name = "type", value = "类型(1.法律法规2.政策文件)", required = true, dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "isPortal", value = "是否门户网(1.是 2.否) 不传则是门户网", required = true, dataType = "String", paramType = "query") + }) @GetMapping("/selectConfigList") public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum, @@ -47,11 +49,13 @@ @RequestParam(value = "name",required = false) String name, @RequestParam(value = "type",required = false) String type, @RequestParam(value = "departmentId",required = false) Integer departmentId, + @RequestParam(value = "isPortal",required = false) String isPortal, @CurrentUser SysUser sysUser){ Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize); List<String> ids=null; - if (sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){ - ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId()); + if ( (isPortal != null && isPortal.equals("2"))&&sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){ + if (sysUser.getDepartmentId()!=null) + 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)); -- Gitblit v1.7.1