From 85101442ba00e13c50356c599d45c58a4034ba43 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 02 Jun 2021 17:26:40 +0800 Subject: [PATCH] screen-manage 修改user更新字段 --- screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 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 972c8da..5b9656c 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 @@ -92,20 +92,23 @@ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String content = "���������������:"+manageMenuOld.getName()+";"; for (Object key:map.keySet()) { - if (key.toString().equals("name")){ + if (key.toString().equals("name")&&map.get(key)!=null){ content = content+"���������:"+manageMenuOld.getName()+"->"+map.get(key)+";"; } - if (key.toString().equals("url")){ + if (key.toString().equals("url")&&map.get(key)!=null){ content = content+"url������:"+manageMenuOld.getUrl()+"->"+map.get(key)+";"; } - if (key.toString().equals("icon")){ + if (key.toString().equals("icon")&&map.get(key)!=null){ content = content+"������������:"+manageMenuOld.getIcon()+"->"+map.get(key)+";"; } - if (key.toString().equals("parent_id")){ + if (key.toString().equals("parent_id")&&map.get(key)!=null){ content = content+"���������:"+manageMenuMapper.getManageMenuById(manageMenuOld.getId()).getName()+"->"+manageMenuMapper.getManageMenuById(Integer.parseInt(map.get(key).toString())).getName()+";"; } - if (key.toString().equals("order")){ + 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); @@ -215,6 +218,23 @@ } @Override + public List getManageChildMenuByRoleId(int roleId) { + List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByRoleId(roleId); + List menuIdList = new ArrayList(); + Map limitMap = new HashMap(); + limitMap.put("start", 1); + limitMap.put("number", 1); + for (ManageMenu manageMenu:manageMenus) { + limitMap.put("parent_id", manageMenu.getId()); + List result = manageMenuMapper.getManageMenuByCondition(limitMap); + if (result.size()==0){ + menuIdList.add(manageMenu.getId()); + } + } + return menuIdList; + } + + @Override public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) { Map limitMap = new HashMap(); limitMap.put("name", map.get("name")); -- Gitblit v1.8.0