From 52f100ec7860c781c1b44259c6c54b221a30c100 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 24 May 2021 17:11:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java |    4 ++--
 1 files changed, 2 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..c4a94b0 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)+";";
                 }
             }

--
Gitblit v1.8.0