From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
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