From 56e2dc02ca5f4cf38308f8a1389322639f89e99e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b359059..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,17 +18,18 @@
@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.getUserType().equals("3") && sysUser.getIsDivisionHead().equals("1")){//部门领导
- if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId())){//如果是一个部门则可以删除
+ }else if ( sysUser.getIsDivisionHead().equals("1")){//部门领导
+ if (sysUser.getDepartmentId().equals(automessagePolicyDocuments.getDepartmentId().toString())){//如果是一个部门则可以删除
automessagePolicyDocuments.setIsDelete(1);
}else {
automessagePolicyDocuments.setIsDelete(2);
}
}
- else if (sysUser.getUserType().equals("2")){
+ else if (sysUser.getUserType().equals("2")){//导办人员
if(sysUser.getUserId().equals(automessagePolicyDocuments.getCreateUserId())){//如果它创建的则可以删除
automessagePolicyDocuments.setIsDelete(1);
}else {
@@ -36,6 +37,7 @@
}
}
}
+ }
return automessagePolicyDocumentsList;
}
--
Gitblit v1.7.1