From 5cc8b3391df3b351dc3427ba3d4bc335af287754 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 23 Apr 2021 14:46:04 +0800
Subject: [PATCH] 角色配置空菜单

---
 screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java                  |    8 ++++----
 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java |   16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index e972972..4009151 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -32,10 +32,10 @@
     TIME_FORMAT_INVALID(-18,"������������������"),
     TIME_INVALID(-19,"������������"),
     GROUP_EXIST(-20, "������������"),
-    ROLE_IS_EXPIRE(-21, "���������������"),
-    ROLE_IS_NULL(-22, "������������"),
-    MENU_IS_EXPIRE(-23, "���������������"),
-    MENU_IS_NULL(-24, "������������"),
+    ROLE_IS_EXPIRE(-21, "���������������������"),
+    ROLE_IS_NULL(-22, "���������������"),
+    MENU_IS_EXPIRE(-23, "���������������������"),
+    MENU_IS_NULL(-24, "���������������"),
     PARAMETERS_NOT_REQUIREMENT(-25, "���������������������"),
     DICTTYPE_NOT_EXIST(-26,"���������������������"),
     DICTTYPE_EXIST(-27,"������������������������"),
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
index 5450a72..57b433f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java
@@ -53,15 +53,15 @@
     public Map<String, Object> updateRoleMenu(List list, int id) {
         Map<String,Object> resultMap = new HashMap<>();
         List<ManageMenu> manageMenusOld = manageMenuMapper.getManageMenuByRoleId(id);
-        if (list.size()==0){
-            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
-            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
-            return resultMap;
-        }
         QueryWrapper<ManageRoleMenu> wrapper = new QueryWrapper();
         wrapper.eq("role_id",id);
         wrapper.eq("is_delete",0);
-        List<Map> result = manageRoleMenuMapper.getDataByMenuIds(list,id);
+        List<Map> result = new ArrayList<>();
+        if (list.size()==0){
+            result = result;
+        }else {
+            result = manageRoleMenuMapper.getDataByMenuIds(list,id);
+        }
         List<Map> result1 = manageRoleMenuMapper.getDataByRoleId(id);
         if (manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0){
             List<Map> insertList = new ArrayList<>();
@@ -71,7 +71,9 @@
                 map.put("menu_id",Integer.parseInt(temp.toString()));
                 insertList.add(map);
             }
-            manageRoleMenuMapper.insertBatch(insertList);
+            if (insertList.size()!=0){
+                manageRoleMenuMapper.insertBatch(insertList);
+            }
         }
         List updateList = new ArrayList();
         for (Map manageRoleMenu:result1) {

--
Gitblit v1.8.0