Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-23 38b5da7912ca6ab2bb2bb001cd55803bbb849d29

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 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,10 +49,11 @@
                                          @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"))){
        if ( (isPortal != null && isPortal.equals(2))&&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);