From d6a0a1bb4c7b27a6521c969046cb969b168fa93a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Jun 2021 10:11:08 +0800
Subject: [PATCH] screen-manage 更新组织删除逻辑，存在站点或者子组织存在站点则无法删除。
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 5efe435..72b79bc 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -156,10 +156,10 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+manageRoleOld.getName()+";";
for (Object key:map.keySet()) {
- if (key.toString().equals("name")){
+ if (key.toString().equals("name")&&map.get(key)!=null){
content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&map.get(key)!=null){
content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
}
}
@@ -179,6 +179,7 @@
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
+ wrapper.orderByDesc("create_time");
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--
Gitblit v1.8.0