Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-23 e2f232a6fc6404513ae53d69405d95d2eb9429ce

Merge branch 'zigonggao_dev' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java

@@ -53,7 +53,8 @@
                                          @CurrentUser SysUser sysUser){
        Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=null;
        if ( (isPortal != null && isPortal.equals(2))&&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"))){
            if (sysUser.getDepartmentId()!=null)
           ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId());
        }
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId,ids);