From 3481b78afafe5ff83d68a4f58741b7c15efcaeb1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 15:20:13 +0800
Subject: [PATCH] screen-manage 组织分配菜单界面读取当前组织已有菜单接口
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 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 aca8fc5..5efe435 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
@@ -2,14 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.ManageAccount;
-import com.moral.api.entity.ManageAccountRole;
-import com.moral.api.entity.ManageLog;
-import com.moral.api.entity.ManageRole;
-import com.moral.api.mapper.ManageAccountRoleMapper;
-import com.moral.api.mapper.ManageLogMapper;
-import com.moral.api.mapper.ManageRoleMapper;
-import com.moral.api.mapper.ManageRoleMenuMapper;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.*;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -51,6 +45,9 @@
@Autowired(required = false)
private ManageRoleMapper manageRoleMapper;
+
+ @Autowired(required = false)
+ private ManageMenuMapper manageMenuMapper;
@Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
@@ -112,15 +109,22 @@
manageRoleMapper.insertOne(manageRole);
ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
int role_id = manageRoleIns.getId();
- List insertList = new ArrayList();
- for (Object temp: list) {
- Map<String,Integer> insertMap = new HashMap<>();
- insertMap.put("role_id",role_id);
- insertMap.put("menu_id",Integer.parseInt(temp.toString()));
- insertList.add(insertMap);
- }
- //���������������������������������������������
- if (insertList.size()>0){
+ if (list.size()>0){
+ //���������������
+ List supplementList = new ArrayList();
+ supplementList.addAll(list);
+ for (int i=0;i<supplementList.size();i++) {
+ supplementList.addAll(supplementParentMenus(Integer.parseInt(supplementList.get(i).toString())));
+ }
+ LinkedHashSet<Object> hashSet = new LinkedHashSet<>(supplementList);
+ ArrayList<Object> menuList = new ArrayList<>(hashSet);
+ List insertList = new ArrayList();
+ for (Object temp: menuList) {
+ Map<String,Integer> insertMap = new HashMap<>();
+ insertMap.put("role_id",role_id);
+ insertMap.put("menu_id",Integer.parseInt(temp.toString()));
+ insertList.add(insertMap);
+ }
manageRoleMenuMapper.insertBatch(insertList);
}
//������������������
@@ -233,4 +237,21 @@
}
return resultMap;
}
+
+ /**
+ * @Description: ���������������
+ * @Param: [list, menuId]list���menuId������
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/28
+ */
+ private List supplementParentMenus(int menuId) {
+ List list = new ArrayList();
+ ManageMenu manageMenu = manageMenuMapper.getManageMenuById(menuId);
+ if (manageMenu.getParentId()!=0){
+ list.add(manageMenu.getParentId());
+ list.addAll(supplementParentMenus(manageMenu.getParentId()));
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0