From 2cf0253cf25e8e74958075eb3d1a1b8eac70356d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 08:50:19 +0800
Subject: [PATCH] 去除员工管理菜单。角色分配唯一
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 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 e5fabb1..e48fc17 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
@@ -60,15 +60,23 @@
if (manageMenuMapper.getManageMenuByName(manageMenu.getName()) != null) {
resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
- } else {
- manageMenuMapper.insertOne(manageMenu);
- //������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "������������:"+manageMenu.getName()+";";
- logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
- resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
- resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
}
+ QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
+ wrapper_url.eq("url",manageMenu.getUrl());
+ wrapper_url.eq("is_delete",Constants.NOT_DELETE);
+ if (manageMenuMapper.selectCount(wrapper_url) != 0) {
+ resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ manageMenuMapper.insertOne(manageMenu);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "������������:"+manageMenu.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
@@ -84,42 +92,56 @@
if (manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString())) == null) {
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;
+ return resultMap;
+ }
+ 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;
+ }
+ QueryWrapper<ManageMenu> wrapper_url = new QueryWrapper();
+ wrapper_url.eq("url",map.get("url"));
+ wrapper_url.eq("is_delete",Constants.NOT_DELETE);
+ if (manageMenuMapper.selectCount(wrapper_url) != 0) {
+ resultMap.put("code", ResponseCodeEnum.URL_IS_EXIST.getCode());
+ resultMap.put("msg", ResponseCodeEnum.URL_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ //���������������������������������������
+ ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
+ manageMenuMapper.updateManageMenuById(map);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+manageMenuOld.getName()+";";
+ for (Object key:map.keySet()) {
+ if (key.toString().equals("name")&&map.get(key)!=null){
+ content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
}
- //���������������������������������������
- ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
- manageMenuMapper.updateManageMenuById(map);
- //������������������
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- String content = "���������������:"+manageMenuOld.getName()+";";
- for (Object key:map.keySet()) {
- if (key.toString().equals("name")&&map.get(key)!=null){
- content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("url")&&map.get(key)!=null){
- content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("icon")&&map.get(key)!=null){
- content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
- }
- if (key.toString().equals("parent_id")&&map.get(key)!=null){
+ if (key.toString().equals("url")&&map.get(key)!=null){
+ content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("icon")&&map.get(key)!=null){
+ content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("parent_id")&&map.get(key)!=null){
+ if (map.get(key).toString().equals("0")){
+ content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->0"+";";
+ }else if (manageMenuOld.getId().toString().equals("0")){
+ content = content+"���������:"+"0->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
+ }else {
content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";";
}
- 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());
- resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ 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());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
--
Gitblit v1.8.0