|
|
|
@ -110,7 +110,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != hosList && !hosList.isEmpty()){
|
|
|
|
|
if(!hosList.isEmpty()){
|
|
|
|
|
//组织树
|
|
|
|
|
int id = 1;
|
|
|
|
|
int oneLevelId = 0;
|
|
|
|
@ -126,7 +126,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
id++;
|
|
|
|
|
//获取该医院不重复角色
|
|
|
|
|
Map<Integer,Power_UserAndRoleTree> roleListByHosId = new HashMap<>();
|
|
|
|
|
if(null != roleList && !roleList.isEmpty()) {
|
|
|
|
|
if(!roleList.isEmpty()) {
|
|
|
|
|
//属于该医院的权限系统下有有该角色
|
|
|
|
|
for (Power_UserAndRoleTree powerRole : roleList) {
|
|
|
|
|
if (null != powerRole.getParentId() && powerRole.getParentId().equals(hos.getSelfId())) {
|
|
|
|
@ -135,7 +135,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//第二级权限系统
|
|
|
|
|
if(null != powerList && !powerList.isEmpty()){
|
|
|
|
|
if(!powerList.isEmpty()){
|
|
|
|
|
for(Power_UserAndRoleTree powerSys : powerList){
|
|
|
|
|
if(powerSys.getParentId().equals(hos.getSelfId())){
|
|
|
|
|
Power_UserAndRoleTree tree2 = new Power_UserAndRoleTree();
|
|
|
|
@ -147,7 +147,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
treeList.add(tree2);
|
|
|
|
|
id++;
|
|
|
|
|
//第三级角色
|
|
|
|
|
if(null != roleListByHosId && !roleListByHosId.isEmpty()){
|
|
|
|
|
if(!roleListByHosId.isEmpty()){
|
|
|
|
|
//属于该医院的权限系统下有有该角色
|
|
|
|
|
for (Map.Entry<Integer, Power_UserAndRoleTree> entry : roleListByHosId.entrySet()) {
|
|
|
|
|
if(entry.getValue().getParentId().equals(hos.getSelfId())){
|
|
|
|
@ -167,12 +167,12 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
//取系统和角色
|
|
|
|
|
Map<String,Power_UserAndRoleTree> sysListByHosDeptId = new HashMap<>();
|
|
|
|
|
List<Power_UserAndRoleTree> tempRoleList = new ArrayList<>();
|
|
|
|
|
if(null != deptList && !deptList.isEmpty()) {
|
|
|
|
|
if(!deptList.isEmpty()) {
|
|
|
|
|
for (Power_UserAndRoleTree dept : deptList) {
|
|
|
|
|
if (dept.getParentId().equals(hos.getSelfId())) {
|
|
|
|
|
Set<String> sysFlagSet = new TreeSet<>();
|
|
|
|
|
//获取该科室不重复系统
|
|
|
|
|
if (null != sysList && !sysList.isEmpty()) {
|
|
|
|
|
if (!sysList.isEmpty()) {
|
|
|
|
|
for (Power_UserAndRoleTree sys : sysList) {
|
|
|
|
|
if (null != sys.getParentId() && sys.getDeptId().equals(dept.getDeptId())) {
|
|
|
|
|
sysListByHosDeptId.put(sys.getSysFlag(),sys);
|
|
|
|
@ -181,7 +181,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//给角色设置系统权限
|
|
|
|
|
if (null != roleList && !roleList.isEmpty()) {
|
|
|
|
|
if (!roleList.isEmpty()) {
|
|
|
|
|
for (Power_UserAndRoleTree role : roleList) {
|
|
|
|
|
StringBuilder sysFlagStr = new StringBuilder();
|
|
|
|
|
String deptId = role.getDeptId();
|
|
|
|
@ -189,9 +189,9 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
//单一科室
|
|
|
|
|
if (!deptId.contains(",")) {
|
|
|
|
|
if (deptId.equals(dept.getDeptId())) {
|
|
|
|
|
if(null != sysFlagSet && !sysFlagSet.isEmpty()){
|
|
|
|
|
if(!sysFlagSet.isEmpty()){
|
|
|
|
|
for(String sysFlag:sysFlagSet){
|
|
|
|
|
sysFlagStr.append(sysFlag + ",");
|
|
|
|
|
sysFlagStr.append(sysFlag).append(",");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isNotBlank(sysFlagStr)){
|
|
|
|
@ -206,9 +206,9 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
String[] deptIds = deptId.split(",");
|
|
|
|
|
for (String deptStr : deptIds) {
|
|
|
|
|
if (StringUtils.isNotBlank(deptStr) && deptStr.equals(dept.getDeptId())) {
|
|
|
|
|
if(null != sysFlagSet && !sysFlagSet.isEmpty()){
|
|
|
|
|
if(!sysFlagSet.isEmpty()){
|
|
|
|
|
for(String sysFlag:sysFlagSet){
|
|
|
|
|
sysFlagStr.append(sysFlag + ",");
|
|
|
|
|
sysFlagStr.append(sysFlag).append(",");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isNotBlank(sysFlagStr)){
|
|
|
|
@ -226,7 +226,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//第三级系统
|
|
|
|
|
if (null != sysListByHosDeptId && !sysListByHosDeptId.isEmpty()) {
|
|
|
|
|
if (!sysListByHosDeptId.isEmpty()) {
|
|
|
|
|
for (Map.Entry<String,Power_UserAndRoleTree> sys : sysListByHosDeptId.entrySet()) {
|
|
|
|
|
if(sys.getValue().getParentId().equals(hos.getSelfId())){
|
|
|
|
|
Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree();
|
|
|
|
@ -239,7 +239,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
id++;
|
|
|
|
|
//第四级角色
|
|
|
|
|
Map<Integer,Power_UserAndRoleTree> roleListBySys = new HashMap<>();
|
|
|
|
|
if (null != roleList && !roleList.isEmpty()) {
|
|
|
|
|
if (!roleList.isEmpty()) {
|
|
|
|
|
for (Power_UserAndRoleTree role : tempRoleList) {
|
|
|
|
|
String sysFlag = role.getSysFlag();
|
|
|
|
|
if(StringUtils.isNotBlank(sysFlag)){
|
|
|
|
@ -254,7 +254,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != roleListBySys && !roleListBySys.isEmpty()){
|
|
|
|
|
if(!roleListBySys.isEmpty()){
|
|
|
|
|
for (Map.Entry<Integer,Power_UserAndRoleTree> roleBySys:roleListBySys.entrySet()) {
|
|
|
|
|
Power_UserAndRoleTree tree6 = new Power_UserAndRoleTree();
|
|
|
|
|
BeanUtils.copyProperties(roleBySys.getValue(), tree6);
|
|
|
|
@ -299,10 +299,10 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
//否则按角色菜单表该角色的权限选中
|
|
|
|
|
List<Power_Role_Menu> roleMenus = roleMenuMapper.selectRoleMenuByRoleId(roleId);
|
|
|
|
|
if(null != menus && !menus.isEmpty() && null != roleMenus && !roleMenus.isEmpty()){
|
|
|
|
|
for (int i = 0; i < menus.size(); i++) {
|
|
|
|
|
for (int j = 0; j < roleMenus.size(); j++) {
|
|
|
|
|
if(menus.get(i).getMenuId().equals(roleMenus.get(j).getMenuId())){
|
|
|
|
|
menus.get(i).setChecked("true");
|
|
|
|
|
for (Power_Menu menu : menus) {
|
|
|
|
|
for (Power_Role_Menu roleMenu : roleMenus) {
|
|
|
|
|
if (menu.getMenuId().equals(roleMenu.getMenuId())) {
|
|
|
|
|
menu.setChecked("true");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -404,7 +404,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != hosList && !hosList.isEmpty()){
|
|
|
|
|
if(!hosList.isEmpty()){
|
|
|
|
|
//组织树
|
|
|
|
|
int id = 1;
|
|
|
|
|
int oneLevelId = 0;
|
|
|
|
@ -420,7 +420,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
treeList.add(tree1);
|
|
|
|
|
id++;
|
|
|
|
|
//第二级权限系统
|
|
|
|
|
if(null != powerList && !powerList.isEmpty()){
|
|
|
|
|
if(!powerList.isEmpty()){
|
|
|
|
|
for(Power_UserAndRoleTree powerSys : powerList){
|
|
|
|
|
if(powerSys.getParentId().equals(hos.getSelfId())){
|
|
|
|
|
Power_UserAndRoleTree tree2 = new Power_UserAndRoleTree();
|
|
|
|
@ -429,10 +429,10 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
twoLevelId = id;
|
|
|
|
|
tree2.setParentId(oneLevelId);
|
|
|
|
|
tree2.setSysFlag(powerSys.getSysFlag());
|
|
|
|
|
Boolean isParent = false;
|
|
|
|
|
boolean isParent = false;
|
|
|
|
|
id++;
|
|
|
|
|
//第三级用户
|
|
|
|
|
if(null != userList && !userList.isEmpty()){
|
|
|
|
|
if(!userList.isEmpty()){
|
|
|
|
|
//属于该医院的权限系统下有有该用户
|
|
|
|
|
for(Power_UserAndRoleTree powerUser : userList){
|
|
|
|
|
if(null != powerUser.getParentId() && powerUser.getParentId().equals(hos.getSelfId())){
|
|
|
|
@ -462,7 +462,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//第二级科室
|
|
|
|
|
if(null != deptList && !deptList.isEmpty()){
|
|
|
|
|
if(!deptList.isEmpty()){
|
|
|
|
|
for(Power_UserAndRoleTree dept : deptList){
|
|
|
|
|
if(dept.getParentId().equals(hos.getSelfId())){
|
|
|
|
|
Power_UserAndRoleTree tree4 = new Power_UserAndRoleTree();
|
|
|
|
@ -475,7 +475,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
id++;
|
|
|
|
|
}
|
|
|
|
|
//第三级系统
|
|
|
|
|
if(null != sysList && !sysList.isEmpty()){
|
|
|
|
|
if(!sysList.isEmpty()){
|
|
|
|
|
for(Power_UserAndRoleTree sys : sysList) {
|
|
|
|
|
if (null != sys.getParentId() && sys.getDeptId().equals(dept.getDeptId()) && sys.getParentId().equals(hos.getSelfId())) {
|
|
|
|
|
Power_UserAndRoleTree tree5 = new Power_UserAndRoleTree();
|
|
|
|
@ -485,9 +485,9 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree5.setSysFlag(sys.getSysFlag());
|
|
|
|
|
threeLevelId = id;
|
|
|
|
|
id++;
|
|
|
|
|
Boolean isParent = false;
|
|
|
|
|
boolean isParent = false;
|
|
|
|
|
//第四级用户
|
|
|
|
|
if(null != userList && !userList.isEmpty()) {
|
|
|
|
|
if(!userList.isEmpty()) {
|
|
|
|
|
for (Power_UserAndRoleTree users : userList) {
|
|
|
|
|
String deptId = users.getDeptId();
|
|
|
|
|
if(StringUtils.isNotBlank(deptId)){
|
|
|
|
@ -626,10 +626,10 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
List<Power_User_Menu> userMenus = userMenuMapper.selectUserAndRoleMenuPower(sysFlag, userId);
|
|
|
|
|
if(null != menus && !menus.isEmpty() && null != userMenus && !userMenus.isEmpty()){
|
|
|
|
|
//有符合权限则checked设为true
|
|
|
|
|
for (int i = 0; i < menus.size(); i++) {
|
|
|
|
|
for (int j = 0; j < userMenus.size(); j++) {
|
|
|
|
|
if(menus.get(i).getMenuId().equals(userMenus.get(j).getMenuId())){
|
|
|
|
|
menus.get(i).setChecked("true");
|
|
|
|
|
for (Power_Menu menu : menus) {
|
|
|
|
|
for (Power_User_Menu userMenu : userMenus) {
|
|
|
|
|
if (menu.getMenuId().equals(userMenu.getMenuId())) {
|
|
|
|
|
menu.setChecked("true");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -664,30 +664,29 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
userMenuMapper.deleteByPrimaryKey(userPowers.get(i).getUserMenuId());
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
Power_User power_user = userMapper.selectByPrimaryKey(userId);
|
|
|
|
|
Power_User powerUser = userMapper.selectByPrimaryKey(userId);
|
|
|
|
|
//查询该用户对应的角色菜单权限
|
|
|
|
|
List<Power_Role_Menu> rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, power_user.getRoleId());
|
|
|
|
|
List<Power_Role_Menu> rolePowers = roleMenuMapper.selectRoleMenuPower(sysFlag, powerUser.getRoleId());
|
|
|
|
|
if(null != rolePowers && !rolePowers.isEmpty()){
|
|
|
|
|
if(StringUtils.isBlank(menus)){
|
|
|
|
|
//全取消
|
|
|
|
|
List<Power_User_Menu> list = new ArrayList<>();
|
|
|
|
|
for (int i = 0; i < rolePowers.size(); i++) {
|
|
|
|
|
list.add(addUserFunction(userName, userId, rolePowers.get(i).getMenuId().toString(), 0));
|
|
|
|
|
for (Power_Role_Menu rolePower : rolePowers) {
|
|
|
|
|
list.add(addUserFunction(userName, userId, rolePower.getMenuId().toString(), 0));
|
|
|
|
|
}
|
|
|
|
|
userMenuMapper.simpleInsertUserMenu(list);
|
|
|
|
|
}else{
|
|
|
|
|
//计算新增和删除
|
|
|
|
|
List<String> roles = new ArrayList<>();
|
|
|
|
|
List<String> users = new ArrayList<>();
|
|
|
|
|
for (int i = 0; i < rolePowers.size(); i++) {
|
|
|
|
|
roles.add(rolePowers.get(i).getMenuId().toString());
|
|
|
|
|
for (Power_Role_Menu rolePower : rolePowers) {
|
|
|
|
|
roles.add(rolePower.getMenuId().toString());
|
|
|
|
|
}
|
|
|
|
|
String[] menu = menus.split(",");
|
|
|
|
|
users = Arrays.asList(menu);
|
|
|
|
|
List<String> users = Arrays.asList(menu);
|
|
|
|
|
//新增部分
|
|
|
|
|
Collection<String> inserts=new ArrayList<String>(users);
|
|
|
|
|
inserts.removeAll(roles);
|
|
|
|
|
if(null != inserts && !inserts.isEmpty()){
|
|
|
|
|
if(!inserts.isEmpty()){
|
|
|
|
|
//新增flag为1
|
|
|
|
|
List<Power_User_Menu> list = new ArrayList<>();
|
|
|
|
|
for (String insertMenu : inserts) {
|
|
|
|
@ -700,7 +699,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
//删除部分
|
|
|
|
|
Collection<String> deletes=new ArrayList<String>(roles);
|
|
|
|
|
deletes.removeAll(users);
|
|
|
|
|
if(null != deletes && !deletes.isEmpty()){
|
|
|
|
|
if(!deletes.isEmpty()){
|
|
|
|
|
List<Power_User_Menu> list = new ArrayList<>();
|
|
|
|
|
for(String deleteMenu : deletes){
|
|
|
|
|
if(StringUtils.isNotBlank(deleteMenu)){
|
|
|
|
@ -772,17 +771,17 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
int twoLevel = 0;
|
|
|
|
|
Map<Integer,String> hospitalNameSet = new HashMap<>();
|
|
|
|
|
if(null != dicts && !dicts.isEmpty()){
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){
|
|
|
|
|
hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getHospitalName())) {
|
|
|
|
|
hospitalNameSet.put(dict.getDictId(), dict.getHospitalName());
|
|
|
|
|
}
|
|
|
|
|
//用户集合
|
|
|
|
|
if(null == dicts.get(i).getDictId()){
|
|
|
|
|
userList.add(dicts.get(i));
|
|
|
|
|
if (null == dict.getDictId()) {
|
|
|
|
|
userList.add(dict);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){
|
|
|
|
|
if(!hospitalNameSet.isEmpty()){
|
|
|
|
|
for(Integer hosKey : hospitalNameSet.keySet()){
|
|
|
|
|
Map<String,String> deptNameSet = new HashMap<>();
|
|
|
|
|
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
|
|
|
|
@ -794,21 +793,21 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree1.setId(id);
|
|
|
|
|
tree1.setName(hospitalNameSet.get(hosKey));
|
|
|
|
|
treeList.add(tree1);
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
//查询病案系统的科室
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey) && null != dicts.get(i).getDictDeptId()){
|
|
|
|
|
deptIds.add(dicts.get(i).getDictDeptId());
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey) && null != dict.getDictDeptId()) {
|
|
|
|
|
deptIds.add(dict.getDictDeptId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != deptIds && !deptIds.isEmpty()){
|
|
|
|
|
if(!deptIds.isEmpty()){
|
|
|
|
|
for(Integer deptId : deptIds){
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){
|
|
|
|
|
deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) {
|
|
|
|
|
deptNameSet.put(dict.getDeptIds(), dict.getDeptName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != deptNameSet && !deptNameSet.isEmpty()){
|
|
|
|
|
if(!deptNameSet.isEmpty()){
|
|
|
|
|
for (String key : deptNameSet.keySet()) {
|
|
|
|
|
Map<Integer,Power_Sys_DictVo> sysNameSet = new HashMap<>();
|
|
|
|
|
//科室层
|
|
|
|
@ -820,20 +819,20 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree2.setName(deptNameSet.get(key));
|
|
|
|
|
treeList.add(tree2);
|
|
|
|
|
Map<Integer,String> roleMap = new HashMap<>();
|
|
|
|
|
if (null != userList && !userList.isEmpty()) {
|
|
|
|
|
for (int j = 0; j < userList.size(); j++) {
|
|
|
|
|
if(StringUtils.isNoneBlank(userList.get(j).getSysType())){
|
|
|
|
|
String deptIdss = userList.get(j).getDeptIds();
|
|
|
|
|
if(StringUtils.isNotBlank(deptIdss)){
|
|
|
|
|
if(!deptIdss.contains(",")){
|
|
|
|
|
if(deptIdss.equals(key)){
|
|
|
|
|
roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType());
|
|
|
|
|
if (!userList.isEmpty()) {
|
|
|
|
|
for (Power_Sys_DictVo dictVo : userList) {
|
|
|
|
|
if (StringUtils.isNoneBlank(dictVo.getSysType())) {
|
|
|
|
|
String deptIdss = dictVo.getDeptIds();
|
|
|
|
|
if (StringUtils.isNotBlank(deptIdss)) {
|
|
|
|
|
if (!deptIdss.contains(",")) {
|
|
|
|
|
if (deptIdss.equals(key)) {
|
|
|
|
|
roleMap.put(dictVo.getParentId(), dictVo.getSysType());
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
String[] deptIdsss = deptIdss.split(",");
|
|
|
|
|
for(String deptId:deptIdsss){
|
|
|
|
|
if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){
|
|
|
|
|
roleMap.put(userList.get(j).getParentId(),userList.get(j).getSysType());
|
|
|
|
|
for (String deptId : deptIdsss) {
|
|
|
|
|
if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) {
|
|
|
|
|
roleMap.put(dictVo.getParentId(), dictVo.getSysType());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -890,17 +889,17 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
int twoLevel = 0;
|
|
|
|
|
Map<Integer,String> hospitalNameSet = new HashMap<>();
|
|
|
|
|
if(null != dicts && !dicts.isEmpty()){
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){
|
|
|
|
|
hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getHospitalName())) {
|
|
|
|
|
hospitalNameSet.put(dict.getDictId(), dict.getHospitalName());
|
|
|
|
|
}
|
|
|
|
|
//用户集合
|
|
|
|
|
if(null == dicts.get(i).getDictId()){
|
|
|
|
|
userList.add(dicts.get(i));
|
|
|
|
|
if (null == dict.getDictId()) {
|
|
|
|
|
userList.add(dict);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){
|
|
|
|
|
if(!hospitalNameSet.isEmpty()){
|
|
|
|
|
for(Integer hosKey : hospitalNameSet.keySet()){
|
|
|
|
|
Map<String,String> deptNameSet = new HashMap<>();
|
|
|
|
|
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
|
|
|
|
@ -912,21 +911,21 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree1.setId(id);
|
|
|
|
|
tree1.setName(hospitalNameSet.get(hosKey));
|
|
|
|
|
treeList.add(tree1);
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
//查询病案系统的科室
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getSysFlag().equals(sysFlag) && dicts.get(i).getParentId().equals(hosKey)){
|
|
|
|
|
deptIds.add(dicts.get(i).getDictDeptId());
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getSysFlag()) && dict.getSysFlag().equals(sysFlag) && dict.getParentId().equals(hosKey)) {
|
|
|
|
|
deptIds.add(dict.getDictDeptId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != deptIds && !deptIds.isEmpty()){
|
|
|
|
|
if(!deptIds.isEmpty()){
|
|
|
|
|
for(Integer deptId : deptIds){
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getDeptIds()) && dicts.get(i).getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dicts.get(i).getDeptName())){
|
|
|
|
|
deptNameSet.put(dicts.get(i).getDeptIds(),dicts.get(i).getDeptName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getDeptIds()) && dict.getDeptIds().equals(deptId.toString()) && StringUtils.isNotBlank(dict.getDeptName())) {
|
|
|
|
|
deptNameSet.put(dict.getDeptIds(), dict.getDeptName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != deptNameSet && !deptNameSet.isEmpty()){
|
|
|
|
|
if(!deptNameSet.isEmpty()){
|
|
|
|
|
for (String key : deptNameSet.keySet()) {
|
|
|
|
|
//科室层
|
|
|
|
|
id++;
|
|
|
|
@ -938,20 +937,20 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
treeList.add(tree2);
|
|
|
|
|
Map<Integer,Power_Sys_DictVo> roleMap = new HashMap<>();
|
|
|
|
|
//sysName 用户id,hospitalTel 手机号,dictArea用户名,parentId角色id,sysType角色名
|
|
|
|
|
if (null != userList && !userList.isEmpty()) {
|
|
|
|
|
for (int j = 0; j < userList.size(); j++) {
|
|
|
|
|
if(StringUtils.isNoneBlank(userList.get(j).getDictArea())){
|
|
|
|
|
String deptIdss = userList.get(j).getDeptIds();
|
|
|
|
|
if(StringUtils.isNotBlank(deptIdss)){
|
|
|
|
|
if(!deptIdss.contains(",")){
|
|
|
|
|
if(deptIdss.equals(key)){
|
|
|
|
|
roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j));
|
|
|
|
|
if (!userList.isEmpty()) {
|
|
|
|
|
for (Power_Sys_DictVo dictVo : userList) {
|
|
|
|
|
if (StringUtils.isNoneBlank(dictVo.getDictArea())) {
|
|
|
|
|
String deptIdss = dictVo.getDeptIds();
|
|
|
|
|
if (StringUtils.isNotBlank(deptIdss)) {
|
|
|
|
|
if (!deptIdss.contains(",")) {
|
|
|
|
|
if (deptIdss.equals(key)) {
|
|
|
|
|
roleMap.put(Integer.valueOf(dictVo.getSysName()), dictVo);
|
|
|
|
|
}
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
String[] deptIdsss = deptIdss.split(",");
|
|
|
|
|
for(String deptId:deptIdsss){
|
|
|
|
|
if(StringUtils.isNotBlank(deptId) && deptId.equals(key)){
|
|
|
|
|
roleMap.put(Integer.valueOf(userList.get(j).getSysName()),userList.get(j));
|
|
|
|
|
for (String deptId : deptIdsss) {
|
|
|
|
|
if (StringUtils.isNotBlank(deptId) && deptId.equals(key)) {
|
|
|
|
|
roleMap.put(Integer.valueOf(dictVo.getSysName()), dictVo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1007,13 +1006,13 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
int twoLevel = 0;
|
|
|
|
|
Map<Integer,String> hospitalNameSet = new HashMap<>();
|
|
|
|
|
if(null != dicts && !dicts.isEmpty()){
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(StringUtils.isNotBlank(dicts.get(i).getHospitalName())){
|
|
|
|
|
hospitalNameSet.put(dicts.get(i).getDictId(),dicts.get(i).getHospitalName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (StringUtils.isNotBlank(dict.getHospitalName())) {
|
|
|
|
|
hospitalNameSet.put(dict.getDictId(), dict.getHospitalName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != hospitalNameSet && !hospitalNameSet.isEmpty()){
|
|
|
|
|
if(!hospitalNameSet.isEmpty()){
|
|
|
|
|
for(Integer hosKey : hospitalNameSet.keySet()){
|
|
|
|
|
Map<Integer,String> deptNameSet = new HashMap<>();
|
|
|
|
|
Map<Integer,Power_Sys_DictVo> poweSysNameSet = new HashMap<>();
|
|
|
|
@ -1026,20 +1025,20 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree1.setSelfId(hosKey);
|
|
|
|
|
tree1.setName(hospitalNameSet.get(hosKey));
|
|
|
|
|
treeList.add(tree1);
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(dicts.get(i).getDictId().equals(hosKey)){
|
|
|
|
|
String deptName = dicts.get(i).getDeptName();
|
|
|
|
|
if(StringUtils.isNoneBlank(deptName)){
|
|
|
|
|
deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName());
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (dict.getDictId().equals(hosKey)) {
|
|
|
|
|
String deptName = dict.getDeptName();
|
|
|
|
|
if (StringUtils.isNoneBlank(deptName)) {
|
|
|
|
|
deptNameSet.put(dict.getDeptId(), dict.getDeptName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//添加权限系统
|
|
|
|
|
if(dicts.get(i).getParentId() != null && StringUtils.isNotBlank(dicts.get(i).getSysFlag()) && dicts.get(i).getParentId().equals(hosKey) && "权限系统".equals(dicts.get(i).getSysType())){
|
|
|
|
|
poweSysNameSet.put(dicts.get(i).getDictId(),dicts.get(i));
|
|
|
|
|
if (dict.getParentId() != null && StringUtils.isNotBlank(dict.getSysFlag()) && dict.getParentId().equals(hosKey) && "权限系统".equals(dict.getSysType())) {
|
|
|
|
|
poweSysNameSet.put(dict.getDictId(), dict);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//添加权限系统
|
|
|
|
|
if(null != poweSysNameSet && !poweSysNameSet.isEmpty()){
|
|
|
|
|
if(!poweSysNameSet.isEmpty()){
|
|
|
|
|
for (Integer key : poweSysNameSet.keySet()) {
|
|
|
|
|
id++;
|
|
|
|
|
twoLevel = id;
|
|
|
|
@ -1053,7 +1052,7 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
treeList.add(tree20);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != deptNameSet && !deptNameSet.isEmpty()){
|
|
|
|
|
if(!deptNameSet.isEmpty()){
|
|
|
|
|
for (Integer key : deptNameSet.keySet()) {
|
|
|
|
|
Map<Integer,String> sysNameSet = new HashMap<>();
|
|
|
|
|
//科室层
|
|
|
|
@ -1065,16 +1064,16 @@ public class PowerServiceImpl implements PowerService {
|
|
|
|
|
tree2.setName(deptNameSet.get(key));
|
|
|
|
|
tree2.setSelfId(0-key);
|
|
|
|
|
treeList.add(tree2);
|
|
|
|
|
for (int i = 0; i < dicts.size(); i++) {
|
|
|
|
|
if(dicts.get(i).getDictDeptId() != null && dicts.get(i).getDictDeptId().equals(key)
|
|
|
|
|
&& dicts.get(i).getParentId() != null && dicts.get(i).getParentId().equals(hosKey)){
|
|
|
|
|
String sysName = dicts.get(i).getSysName();
|
|
|
|
|
if(StringUtils.isNoneBlank(sysName)){
|
|
|
|
|
sysNameSet.put(dicts.get(i).getDictId(),sysName);
|
|
|
|
|
for (Power_Sys_DictVo dict : dicts) {
|
|
|
|
|
if (dict.getDictDeptId() != null && dict.getDictDeptId().equals(key)
|
|
|
|
|
&& dict.getParentId() != null && dict.getParentId().equals(hosKey)) {
|
|
|
|
|
String sysName = dict.getSysName();
|
|
|
|
|
if (StringUtils.isNoneBlank(sysName)) {
|
|
|
|
|
sysNameSet.put(dict.getDictId(), sysName);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if(null != sysNameSet && !sysNameSet.isEmpty()){
|
|
|
|
|
if(!sysNameSet.isEmpty()){
|
|
|
|
|
for (Integer dictId : sysNameSet.keySet()) {
|
|
|
|
|
//系统层
|
|
|
|
|
id++;
|
|
|
|
|