From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +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 | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 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