From 38f783d8c84d4232fc3dd31513f327e44b1eb598 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:35:47 +0800
Subject: [PATCH] 菜单更新判断名称是否重复

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
index 6c5fcdc..fb8a118 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java
@@ -85,6 +85,11 @@
             resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
             resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
         } else {
+            if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
+                resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
+                resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
+                return resultMap;
+            }
             //���������������������������������������
             ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
             manageMenuMapper.updateManageMenuById(map);
@@ -92,21 +97,24 @@
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String content = "���������������:"+manageMenuOld.getName()+";";
             for (Object key:map.keySet()) {
-                if (key.toString().equals("name")){
+                if (key.toString().equals("name")&&map.get(key)!=null){
                     content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
                 }
-                if (key.toString().equals("url")){
+                if (key.toString().equals("url")&&map.get(key)!=null){
                     content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
                 }
-                if (key.toString().equals("icon")){
+                if (key.toString().equals("icon")&&map.get(key)!=null){
                     content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
                 }
-                if (key.toString().equals("parent_id")){
+                if (key.toString().equals("parent_id")&&map.get(key)!=null){
                     content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
                 }
-                if (key.toString().equals("order")){
+                if (key.toString().equals("order")&&map.get(key)!=null){
                     content = content+"������������������������:"+manageMenuOld.getOrder()+"->"+map.get(key)+";";
                 }
+                if (key.toString().equals("desc")&&map.get(key)!=null){
+                    content = content+"������:"+manageMenuOld.getDesc()+"->"+map.get(key)+";";
+                }
             }
             logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
             resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());

--
Gitblit v1.8.0