From 598a3670571854ef02293739538e85dbd2f7fd5a Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 15 Apr 2020 11:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E8=8F=9C=E5=8D=95=E6=A0=91=E7=9A=84=E7=82=B9=E5=87=BB?= =?UTF-8?q?bug=E5=8F=8A=E5=8C=BB=E9=99=A2=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E8=BF=9B=E5=BD=92=E6=A1=A3=E7=B3=BB=E7=BB=9F=E6=85=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webservice/impl/PowerWebServiceImpl.java | 4 +- .../webapp/static/js/menu/userPowerList.js | 136 +++++++++--------- .../com/manage/dao/User_Dept_MenuMapper.java | 8 +- .../resources/mapper/User_Dept_MenuMapper.xml | 45 ++++++ .../ipml/User_Dept_MenuServiceImpl.java | 7 +- 5 files changed, 126 insertions(+), 74 deletions(-) diff --git a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java index 0ac9630..05fb048 100644 --- a/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java +++ b/power-admin/src/main/java/com/manage/interfaces/webservice/impl/PowerWebServiceImpl.java @@ -80,9 +80,9 @@ public class PowerWebServiceImpl implements PowerWebService { // 当前用户的所有菜单集合 List tempPowerMenus = new ArrayList<>(powerRoleMenus); for (Power_Menu powerMenu:powerUserMenus) { - if(powerMenu.getFlag() == Constant.EFFECTIVE_YES){ + if(powerMenu.getFlag().equals(Constant.EFFECTIVE_YES)){ tempPowerMenus.add(powerMenu); - }else if(powerMenu.getFlag() == Constant.EFFECTIVE_NO){ + }else if(powerMenu.getFlag().equals(Constant.EFFECTIVE_NO)){ tempPowerMenus.remove(powerMenu); } } diff --git a/power-admin/src/main/webapp/static/js/menu/userPowerList.js b/power-admin/src/main/webapp/static/js/menu/userPowerList.js index cfc741d..2b1245c 100644 --- a/power-admin/src/main/webapp/static/js/menu/userPowerList.js +++ b/power-admin/src/main/webapp/static/js/menu/userPowerList.js @@ -54,74 +54,74 @@ $().ready(function(data){ var streeId = 's'; //展开节点添加子节点 function addChildNodes(event, treeId, treeNode){ - var children = treeNode.children; - var ztree = $.fn.zTree.getZTreeObj("ztree"); - var level = treeNode.level; - treeId = treeNode.id; - var sysFlag = treeNode.sysFlag; - if(children == undefined) { - //1.权限系统，加载该医院所有用户 - if (level == 1 && sysFlag == 'power') { - //获取父节点及医院的医院id - var hospitalId = treeNode.getParentNode().selfId; - $.ajax({ - type: 'get', - url: path + '/menuPower/getUserTreeByHospitalId', - data: {hospitalId: hospitalId}, - dataType: 'json', - async: false, - success: function (data) { - if (data != null) { - var sTreeId = 0; - var treeList = []; - for (var i = 0; i < data.length; i++) { - sTreeId++; - var newNode = { - id: streeId + sTreeId, - parentId: treeId, - name: data[i].name, - newName: data[i].newName, - sysFlag: sysFlag, - selfId: data[i].name.split('-')[0] - } - treeList.push(newNode); - } - ztree.addNodes(treeNode, treeList); - } - } - }) - } - //1.其他系统，加载该科室下用户 - if (level == 2) { - var deptId = treeNode.getParentNode().selfId; - $.ajax({ - type: 'get', - url: path + '/menuPower/getUserTreeByDeptId', - data: {deptId: deptId}, - dataType: 'json', - async: false, - success: function (data) { - if (data != null) { - var sTreeId = 0; - var treeList = []; - for (var i = 0; i < data.length; i++) { - sTreeId++; - var newNode = { - id: streeId + sTreeId, - parentId: treeId, - name: data[i].name, - newName: data[i].newName, - sysFlag: sysFlag, - selfId: data[i].name.split('-')[0] - } - treeList.push(newNode); - } - ztree.addNodes(treeNode, treeList); - } - } - }) - } - } + var children = treeNode.children; + var ztree = $.fn.zTree.getZTreeObj("ztree"); + var level = treeNode.level; + treeId = treeNode.id; + var sysFlag = treeNode.sysFlag; + if(children == undefined) { + //1.权限系统，加载该医院所有用户 + if (level == 1 && sysFlag == 'power') { + //获取父节点及医院的医院id + var hospitalId = treeNode.getParentNode().selfId; + $.ajax({ + type: 'get', + url: path + '/menuPower/getUserTreeByHospitalId', + data: {hospitalId: hospitalId}, + dataType: 'json', + async: false, + success: function (data) { + if (data != null) { + var sTreeId = 0; + var treeList = []; + for (var i = 0; i < data.length; i++) { + sTreeId++; + var newNode = { + id: streeId + sTreeId, + parentId: treeId, + name: data[i].name, + newName: data[i].newName, + sysFlag: sysFlag, + selfId: data[i].selfId + } + treeList.push(newNode); + } + ztree.addNodes(treeNode, treeList); + } + } + }) + } + //1.其他系统，加载该科室下用户 + if (level == 2) { + var deptId = treeNode.getParentNode().selfId; + $.ajax({ + type: 'get', + url: path + '/menuPower/getUserTreeByDeptId', + data: {deptId: deptId}, + dataType: 'json', + async: false, + success: function (data) { + if (data != null) { + var sTreeId = 0; + var treeList = []; + for (var i = 0; i < data.length; i++) { + sTreeId++; + var newNode = { + id: streeId + sTreeId, + parentId: treeId, + name: data[i].name, + newName: data[i].newName, + sysFlag: sysFlag, + selfId: data[i].selfId + } + treeList.push(newNode); + } + ztree.addNodes(treeNode, treeList); + } + } + }) + } + } } //关键字搜索树 diff --git a/power-dao/src/main/java/com/manage/dao/User_Dept_MenuMapper.java b/power-dao/src/main/java/com/manage/dao/User_Dept_MenuMapper.java index 93ec63e..7c0ea14 100644 --- a/power-dao/src/main/java/com/manage/dao/User_Dept_MenuMapper.java +++ b/power-dao/src/main/java/com/manage/dao/User_Dept_MenuMapper.java @@ -6,9 +6,11 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface User_Dept_MenuMapper { - List selectAll(@Param("userName") String userName,@Param("sysFlag") String sysFlag,@Param("userId") Integer userId,@Param("roleId") Integer roleId,@Param("sysId") Integer sysId,@Param("hospitalId") Integer hospitalId); + List selectAll(@Param("userName") String userName,@Param("sysFlag") String sysFlag,@Param("userId") Integer userId,@Param("roleId") Integer roleId,@Param("sysId") Integer sysId,@Param("hospitalId") Integer hospitalId); - List selectAllMenusByUserIdAndSysFlag(@Param("userId")Integer userId,@Param("sysFlag")String sysFlag); + List selectAllMenusByUserIdAndSysFlag(@Param("userId")Integer userId,@Param("sysFlag")String sysFlag); - List validUserRoleMenu(@Param("userId")Integer userId, @Param("url")String url); + List validUserRoleMenu(@Param("userId")Integer userId, @Param("url")String url); + + List selectMenuListByRoleId(@Param("userName") String userName,@Param("sysFlag") String sysFlag); } \ No newline at end of file diff --git a/power-dao/src/main/resources/mapper/User_Dept_MenuMapper.xml b/power-dao/src/main/resources/mapper/User_Dept_MenuMapper.xml index 792f646..a071565 100644 --- a/power-dao/src/main/resources/mapper/User_Dept_MenuMapper.xml +++ b/power-dao/src/main/resources/mapper/User_Dept_MenuMapper.xml @@ -1023,4 +1023,49 @@ AND sys_flag = #{sysFlag} + + \ No newline at end of file diff --git a/power-service/src/main/java/com/manage/service/ipml/User_Dept_MenuServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/User_Dept_MenuServiceImpl.java index ab2cb0a..36ed622 100644 --- a/power-service/src/main/java/com/manage/service/ipml/User_Dept_MenuServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/User_Dept_MenuServiceImpl.java @@ -29,7 +29,12 @@ public class User_Dept_MenuServiceImpl implements User_Dept_MenuService { @Override public List selectAll(String userName,String sysFlag,Integer userId,Integer roleId, Integer sysId,Integer hospitalId) { - return userDeptMenuMapper.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId); + if("-100".equals(roleId)){ + //针对查询菜单权限 + return userDeptMenuMapper.selectMenuListByRoleId(userName, sysFlag); + }else{ + return userDeptMenuMapper.selectAll(userName, sysFlag, userId, roleId, sysId, hospitalId); + } } @Override