From aff62e24d29b010d6de109a260854d9eaaf1e3ed Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 14:25:22 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
index 864b132..eb62e65 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java
@@ -18,11 +18,12 @@
@Override
public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId) {
List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId);
+ if (sysUser!=null){
for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
if(sysUser.getUserType().equals("1")){//超级管理员
automessagePolicyDocuments.setIsDelete(1);
}else if ( sysUser.getIsDivisionHead().equals("1")){//部门领导
- if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId())){//如果是一个部门则可以删除
+ if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId().toString())){//如果是一个部门则可以删除
automessagePolicyDocuments.setIsDelete(1);
}else {
automessagePolicyDocuments.setIsDelete(2);
@@ -36,6 +37,7 @@
}
}
}
+ }
return automessagePolicyDocumentsList;
}
--
Gitblit v1.7.1