From 4ffa538faf935b66bcb4eae6923c74959f00df97 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 3 Jun 2020 15:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=92=E5=B1=9E=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E9=AB=98=E5=BA=A6=E5=A4=AA=E9=AB=98=E6=9C=AA=E5=87=BA?=
=?UTF-8?q?=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1Bug=E5=8F=8A=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/manage/controller/FontController.java | 7 +++----
.../webapp/WEB-INF/views/dictDir/dict.jsp | 5 ++++-
.../resources/mapper/Power_Sys_DictMapper.xml | 15 +++++++-------
.../manage/service/ipml/PowerServiceImpl.java | 20 +++++--------------
4 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 5e44f50..9a5f754 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -63,7 +63,7 @@ public class FontController {
/**
* 2.1
- * @ProjectName: getUserPowerTreeBySysFlag
+ * @ProjectName: getRolePowerTreeBySysFlag
* @Description: 获取菜单通过系统标识
* @Param 无
* @Return getMenusByUserIdAndSysFlag
@@ -74,10 +74,9 @@ public class FontController {
* @UpdateRemark: 更新说明
* @Version: 1.0
*/
- @RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.GET)
+ @RequestMapping(value = "getMenusByUserIdAndSysFlag",method = RequestMethod.POST)
@ResponseBody
- public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId,
- Integer sysId,Integer hospitalId){
+ public Msg getMenusByUserIdAndSysFlag(String userName,String sysFlag,Integer userId,Integer roleId,Integer sysId,Integer hospitalId){
try {
if(StringUtils.isNotBlank(sysFlag) && StringUtils.isBlank(userName) && userId == null && roleId == null
&& sysId == null && hospitalId == null){
diff --git a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp b/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp
index d5550f8..69276f9 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp
@@ -92,6 +92,9 @@
width: 320px;
height: 380px;
}
+ #iframe{
+
+ }
@@ -145,7 +148,7 @@
-
+
diff --git a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml
index 76f876b..af8d253 100644
--- a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml
@@ -23,8 +23,7 @@
-
-
+
dict_id, dept_id, hospital_name, sys_flag, sys_name, dict_area, hospital_tel, parent_id,
@@ -350,15 +349,15 @@
dict.dept_id dictDeptId,
dept.dept_id deptId,
dict.hospital_name hospitalName,
- dict.sys_name sysName,
+ dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
- dept.dept_name deptName,
+ dept.dept_name,
dict.hospital_tel,
dict.dict_area
FROM
power_sys_dict dict
- LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id
+ LEFT JOIN power_dept dept ON dict.dept_id = dept.dict_id
AND dict.dict_status = 1 AND dept.effective = 1
@@ -369,13 +368,13 @@
dict.dept_id dictDeptId,
dept.dept_id deptIds,
dict.hospital_name hospitalName,
- dict.sys_name sysName,
+ dict.sys_name,
dict.sys_flag sysFlag,
dict.sys_type sysType,
- dept.dept_name deptName,
+ dept.dept_name,
dict.hospital_tel,
dict.dict_area,
- dept.creater username
+ dept.creater username
FROM
power_sys_dict dict
LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id
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 f8a5ea2..279f40d 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
@@ -1027,24 +1027,14 @@ public class PowerServiceImpl implements PowerService {
tree1.setName(hospitalNameSet.get(hosKey));
treeList.add(tree1);
for (int i = 0; i < dicts.size(); i++) {
- if(user.getRoleId() == 0){
- 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());
- }
- }
- }else{
- if(dicts.get(i).getParentId().equals(hosKey)){
- String deptName = dicts.get(i).getDeptName();
- if(StringUtils.isNoneBlank(deptName)){
- deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName());
- }
+ if(dicts.get(i).getParentId().equals(hosKey)){
+ String deptName = dicts.get(i).getDeptName();
+ if(StringUtils.isNoneBlank(deptName)){
+ deptNameSet.put(dicts.get(i).getDeptId(),dicts.get(i).getDeptName());
}
}
//添加权限系统
- if(dicts.get(i).getParentId() != null && StringUtils.isNotBlank(dicts.get(i).getSysFlag())
- && dicts.get(i).getParentId().equals(hosKey) && "权限系统".equals(dicts.get(i).getSysType())){
+ 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));
}
}