From e2f232a6fc6404513ae53d69405d95d2eb9429ce Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 18:42:03 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/AutomessagePolicyDocumentsController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 7773b6e..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
@@ -53,8 +53,9 @@
@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"))){
- 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