From a97fb37f2ccdcdd8c5db5684ffbb7f1b0db176b1 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Wed, 15 Apr 2020 09:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=88=86?= =?UTF-8?q?=E9=85=8D=E8=8F=9C=E5=8D=95=E7=9A=84=E7=94=A8=E6=88=B7=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/loginDir/index.jsp | 6 +- .../WEB-INF/views/menu/userPowerList.jsp | 2 +- .../src/main/webapp/static/js/blood.js | 2 +- power-admin/src/main/webapp/static/js/dept.js | 2 +- .../webapp/static/js/menu/userPowerList.js | 8 +- power-admin/src/main/webapp/static/js/role.js | 2 +- power-admin/src/main/webapp/static/js/user.js | 2 +- .../com/manage/vo/Power_UserAndRoleTree.java | 18 +++ .../src/main/resources/mapper/PowerMapper.xml | 22 ++-- .../resources/mapper/Power_UserMapper.xml | 30 +---- .../manage/service/ipml/PowerServiceImpl.java | 114 ++++++++++-------- 11 files changed, 104 insertions(+), 104 deletions(-) diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp index df48bec..20c03a8 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp @@ -28,7 +28,7 @@ height: 59px!important; } .row-fluid{ - overflow-y: hidden； + overflow-y: hidden; } @@ -279,13 +279,13 @@ - <%-- <%@ include file="/WEB-INF/jspf/webSocket.jspf" %> diff --git a/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp b/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp index de90a21..a954b11 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp @@ -76,7 +76,7 @@
- +
diff --git a/power-admin/src/main/webapp/static/js/blood.js b/power-admin/src/main/webapp/static/js/blood.js index 98c9df6..75f23ad 100644 --- a/power-admin/src/main/webapp/static/js/blood.js +++ b/power-admin/src/main/webapp/static/js/blood.js @@ -389,7 +389,7 @@ $('#queryBtn').click(function () { }) //获取table的高度 function getHeight() { - return $(window).height() - 190; + return $(window).height() * 0.8; } //刷新表格 function refresh() { diff --git a/power-admin/src/main/webapp/static/js/dept.js b/power-admin/src/main/webapp/static/js/dept.js index b53c6f5..41eafb2 100644 --- a/power-admin/src/main/webapp/static/js/dept.js +++ b/power-admin/src/main/webapp/static/js/dept.js @@ -389,7 +389,7 @@ $('#queryBtn').click(function () { }) //获取table的高度 function getHeight() { - return $(window).height() - 190; + return $(window).height() * 0.8; } //刷新表格 function refresh() { 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 f19cd51..cfc741d 100644 --- a/power-admin/src/main/webapp/static/js/menu/userPowerList.js +++ b/power-admin/src/main/webapp/static/js/menu/userPowerList.js @@ -127,12 +127,8 @@ function addChildNodes(event, treeId, treeNode){ //关键字搜索树 function reloadTree() { var key = $("#key").val(); - if(key.length > 2){ - $('#loadingModal').modal('show'); - menu.loadMenuTree(); - }else{ - toastr.warning("数据较多,搜索内容字符不少于2位"); - } + $('#loadingModal').modal('show'); + menu.loadMenuTree(); } diff --git a/power-admin/src/main/webapp/static/js/role.js b/power-admin/src/main/webapp/static/js/role.js index 8699ac7..ed0d42f 100644 --- a/power-admin/src/main/webapp/static/js/role.js +++ b/power-admin/src/main/webapp/static/js/role.js @@ -317,7 +317,7 @@ $('#queryBtn').click(function () { }) //获取table的高度 function getHeight() { - return $(window).height() - 190; + return $(window).height() * 0.8; } //刷新表格 function refresh() { diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js index c996bb5..b0e272f 100644 --- a/power-admin/src/main/webapp/static/js/user.js +++ b/power-admin/src/main/webapp/static/js/user.js @@ -472,7 +472,7 @@ function saveForm(){ } //获取table的高度 function getHeight() { - return $(window).height() - 190; + return $(window).height() * 0.8; } //刷新表格 function refresh() { diff --git a/power-dao/src/main/java/com/manage/vo/Power_UserAndRoleTree.java b/power-dao/src/main/java/com/manage/vo/Power_UserAndRoleTree.java index 2d2e632..2f6289b 100644 --- a/power-dao/src/main/java/com/manage/vo/Power_UserAndRoleTree.java +++ b/power-dao/src/main/java/com/manage/vo/Power_UserAndRoleTree.java @@ -33,6 +33,24 @@ public class Power_UserAndRoleTree { private Boolean isParent; + private String realName; + + public Boolean getParent() { + return isParent; + } + + public void setParent(Boolean parent) { + isParent = parent; + } + + public String getRealName() { + return realName; + } + + public void setRealName(String realName) { + this.realName = realName; + } + public Boolean getIsParent() { return isParent; } diff --git a/power-dao/src/main/resources/mapper/PowerMapper.xml b/power-dao/src/main/resources/mapper/PowerMapper.xml index b489fef..4faafee 100644 --- a/power-dao/src/main/resources/mapper/PowerMapper.xml +++ b/power-dao/src/main/resources/mapper/PowerMapper.xml @@ -13,7 +13,7 @@ diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml index a8eba2f..f805c2e 100644 --- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml @@ -271,13 +271,6 @@ user_name = #{userName} - - - - - - - - UPDATE - power_user - SET - role_id = NULL - WHERE - role_id = ${roleId} - + @@ -652,10 +631,10 @@ \ No newline at end of file diff --git a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java index 06e33ab..0834cfb 100644 --- a/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java +++ b/power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java @@ -409,6 +409,7 @@ public class PowerServiceImpl implements PowerService { int id = 1; int oneLevelId = 0; int twoLevelId = 0; + int threeLevelId = 0; for(Power_UserAndRoleTree hos : hosList){ //第一级医院 Power_UserAndRoleTree tree1 = new Power_UserAndRoleTree(); @@ -429,32 +430,34 @@ public class PowerServiceImpl implements PowerService { tree2.setParentId(oneLevelId); tree2.setSysFlag(powerSys.getSysFlag()); Boolean isParent = false; + id++; //第三级用户 if(null != userList && !userList.isEmpty()){ //属于该医院的权限系统下有有该用户 for(Power_UserAndRoleTree powerUser : userList){ if(null != powerUser.getParentId() && powerUser.getParentId().equals(hos.getSelfId())){ - /*Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree(); - BeanUtils.copyProperties(powerUser,tree3); - tree3.setId(id); - tree3.setParentId(twoLevelId); - if(StringUtils.isNotBlank(powerUser.getTel())){ - tree3.setName(powerUser.getSelfId()+"-"+powerUser.getName()+"("+powerUser.getTel()+")"); - tree3.setNewName(powerUser.getSelfId()+"-"+powerUser.getName()+"("+powerUser.getTel()+")"); - }else{ - tree3.setName(powerUser.getSelfId()+"-"+powerUser.getName()); - tree3.setNewName(powerUser.getSelfId()+"-"+powerUser.getName()); + if(StringUtils.isNotBlank(key)){ + Power_UserAndRoleTree tree3 = new Power_UserAndRoleTree(); + BeanUtils.copyProperties(powerUser,tree3); + tree3.setId(id); + tree3.setParentId(twoLevelId); + if(StringUtils.isNotBlank(powerUser.getRealName())){ + tree3.setName(powerUser.getName()+"-"+powerUser.getRealName()); + tree3.setNewName(powerUser.getName()+"-"+powerUser.getRealName()); + }else{ + tree3.setName(powerUser.getName()); + tree3.setNewName(powerUser.getName()); + } + tree3.setSysFlag("power"); + treeList.add(tree3); + id++; } - tree3.setSysFlag("power"); - treeList.add(tree3); - id++;*/ isParent = true; } } } tree2.setIsParent(isParent); treeList.add(tree2); - id++; } } } @@ -480,6 +483,8 @@ public class PowerServiceImpl implements PowerService { tree5.setId(id); tree5.setParentId(twoLevelId); tree5.setSysFlag(sys.getSysFlag()); + threeLevelId = id; + id++; Boolean isParent = false; //第四级用户 if(null != userList && !userList.isEmpty()) { @@ -490,42 +495,46 @@ public class PowerServiceImpl implements PowerService { if(!deptId.contains(",")){ if(deptId.equals(dept.getDeptId())){ isParent = true; - /*Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree(); - BeanUtils.copyProperties(users,tree6); - tree6.setId(id); - tree6.setParentId(threeLevelId); - if(StringUtils.isNotBlank(users.getTel())){ - tree6.setName(users.getSelfId()+"-"+users.getName()+"("+users.getTel()+")"); - tree6.setNewName(users.getSelfId()+"-"+users.getName()+"("+users.getTel()+")"); - }else{ - tree6.setName(users.getSelfId()+"-"+users.getName()); - tree6.setNewName(users.getSelfId()+"-"+users.getName()); + if(StringUtils.isNotBlank(key)){ + id++; + Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree(); + BeanUtils.copyProperties(users,tree6); + tree6.setId(id); + tree6.setParentId(threeLevelId); + if(StringUtils.isNotBlank(users.getRealName())){ + tree6.setName(users.getName()+"-"+users.getRealName()); + tree6.setNewName(users.getName()+"-"+users.getRealName()); + }else{ + tree6.setName(users.getName()); + tree6.setNewName(users.getName()); + } + tree6.setSysFlag(sys.getSysFlag()); + treeList.add(tree6); + id++; } - tree6.setSysFlag(sys.getSysFlag()); - treeList.add(tree6); - id++;*/ } }else{ //逗号隔开多科室 String[] deptIds = deptId.split(","); for (String deptStr : deptIds) { if(StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())){ - /*Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree(); - BeanUtils.copyProperties(users,tree7); - tree7.setId(id); - tree7.setParentId(threeLevelId); - if(StringUtils.isNotBlank(users.getTel())){ - tree7.setName(users.getSelfId()+"-"+users.getName()+"("+users.getTel()+")"); - tree7.setNewName(users.getSelfId()+"-"+users.getName()+"("+users.getTel()+")"); - }else{ - tree7.setName(users.getSelfId()+"-"+users.getName()); - tree7.setNewName(users.getSelfId()+"-"+users.getName()); + if(StringUtils.isNotBlank(key)){ + Power_UserAndRoleTree tree7 = new Power_UserAndRoleTree(); + BeanUtils.copyProperties(users,tree7); + tree7.setId(id); + tree7.setParentId(threeLevelId); + if(StringUtils.isNotBlank(users.getRealName())){ + tree7.setName(users.getName()+"-"+users.getRealName()); + tree7.setNewName(users.getName()+"-"+users.getRealName()); + }else{ + tree7.setName(users.getName()); + tree7.setNewName(users.getName()); + } + tree7.setSysFlag(sys.getSysFlag()); + treeList.add(tree7); + id++; } - tree7.setSysFlag(sys.getSysFlag()); - treeList.add(tree7); - id++;*/ isParent = true; - continue; } } } @@ -534,7 +543,6 @@ public class PowerServiceImpl implements PowerService { } tree5.setIsParent(isParent); treeList.add(tree5); - id++; } } } @@ -552,13 +560,14 @@ public class PowerServiceImpl implements PowerService { if(null != userList && !userList.isEmpty()){ for (Power_User users : userList) { Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree(); - if(StringUtils.isNotBlank(users.getUserTel())){ - tree6.setName(users.getUserId()+"-"+users.getUserName()+"("+users.getUserTel()+")"); - tree6.setNewName(users.getUserId()+"-"+users.getUserName()+"("+users.getUserTel()+")"); + if(StringUtils.isNotBlank(users.getName())){ + tree6.setName(users.getUserName()+"-"+users.getName()); + tree6.setNewName(users.getUserName()+"-"+users.getName()); }else{ - tree6.setName(users.getUserId()+"-"+users.getUserName()); - tree6.setNewName(users.getUserId()+"-"+users.getUserName()); + tree6.setName(users.getUserName()); + tree6.setNewName(users.getUserName()); } + tree6.setSelfId(users.getUserId()); treeList.add(tree6); } } @@ -572,13 +581,14 @@ public class PowerServiceImpl implements PowerService { if(null != userList && !userList.isEmpty()){ for (Power_User users : userList) { Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree(); - if(StringUtils.isNotBlank(users.getUserTel())){ - tree6.setName(users.getUserId()+"-"+users.getUserName()+"("+users.getUserTel()+")"); - tree6.setNewName(users.getUserId()+"-"+users.getUserName()+"("+users.getUserTel()+")"); + if(StringUtils.isNotBlank(users.getName())){ + tree6.setName(users.getUserName()+"-"+users.getName()); + tree6.setNewName(users.getUserName()+"-"+users.getName()); }else{ - tree6.setName(users.getUserId()+"-"+users.getUserName()); - tree6.setNewName(users.getUserId()+"-"+users.getUserName()); + tree6.setName(users.getUserName()); + tree6.setNewName(users.getUserName()); } + tree6.setSelfId(users.getUserId()); treeList.add(tree6); } }