From 616dca8f5bbb17f0b3a124340965c0232fdae894 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sun, 25 Apr 2021 10:32:01 +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/ManageRoleMenuServiceImpl.java | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 deletions(-)
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 57b433f..b09e4b8 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
@@ -63,7 +63,7 @@
result = manageRoleMenuMapper.getDataByMenuIds(list,id);
}
List<Map> result1 = manageRoleMenuMapper.getDataByRoleId(id);
- if (manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0){
+ if ((manageRoleMenuMapper.selectCount(wrapper)==0 || result.size()==0)&&list.size()!=0){
List<Map> insertList = new ArrayList<>();
for (Object temp:list) {
Map<String,Object> map = new HashMap<>();
@@ -74,47 +74,48 @@
if (insertList.size()!=0){
manageRoleMenuMapper.insertBatch(insertList);
}
- }
- List updateList = new ArrayList();
- for (Map manageRoleMenu:result1) {
- int have = 1;
- for (Object temp:list){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ }else {
+ List updateList = new ArrayList();
+ for (Map manageRoleMenu:result1) {
+ int have = 1;
+ for (Object temp:list){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ updateList.add(manageRoleMenu.get("menu_id"));
}
- if (have == 2){
- continue;
- }
- updateList.add(manageRoleMenu.get("menu_id"));
- }
- List insertList = new ArrayList();
- for (Object temp:list) {
- int have = 1;
- for (Map manageRoleMenu:result1){
- if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
- have = 2;
+ List insertList = new ArrayList();
+ for (Object temp:list) {
+ int have = 1;
+ for (Map manageRoleMenu:result1){
+ if (manageRoleMenu.get("menu_id").equals(Integer.parseInt(temp.toString()))){
+ have = 2;
+ continue;
+ }
+ }
+ if (have == 2){
continue;
}
+ insertList.add(temp);
}
- if (have == 2){
- continue;
+ if (updateList.size()>0){
+ manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
}
- insertList.add(temp);
- }
- if (updateList.size()>0){
- manageRoleMenuMapper.updateDeleteStateByRoleIdMenuIds(updateList,id);
- }
- if (insertList.size()>0){
- List mapList = new ArrayList();
- for (Object temp:insertList) {
- Map<String,Integer> insertMap = new HashMap<>();
- insertMap.put("role_id",id);
- insertMap.put("menu_id",Integer.parseInt(temp.toString()));
- mapList.add(insertMap);
+ if (insertList.size()>0){
+ List mapList = new ArrayList();
+ for (Object temp:insertList) {
+ Map<String,Integer> insertMap = new HashMap<>();
+ insertMap.put("role_id",id);
+ insertMap.put("menu_id",Integer.parseInt(temp.toString()));
+ mapList.add(insertMap);
+ }
+ manageRoleMenuMapper.insertBatch(mapList);
}
- manageRoleMenuMapper.insertBatch(mapList);
}
List<ManageMenu> manageMenusNew = manageMenuMapper.getManageMenuByRoleId(id);
List manageMenuOldList = new ArrayList();
--
Gitblit v1.8.0