power2.0
/
powerbz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改归属管理高度太高未出现滚动条Bug及接口bug

Browse Source
master
zengwh 5 years ago
parent a655ee2cd8
commit 4ffa538faf
4 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File

7
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -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){

5
power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp
Unescape Escape View File

@ -92,6 +92,9 @@
width: 320px;
height: 380px;
}
#iframe{
}
</style>
</head>
<body style="background-color: #ECF0F5">
@ -145,7 +148,7 @@
</div>
<!--存储当前树节点-->
<input type="hidden" id="currentTreeId">
<iframe src="${path}/dict/dictManagePage" id="iframe" name="iframe" style="width:100%;height:100%;" frameborder="0" scrolling="no"></iframe>
<iframe src="${path}/dict/dictManagePage" id="iframe" name="iframe" style="width:100%;height: calc(100vh - 57px);" frameborder="0" scrolling="yes"></iframe>
</div>
</div><!-- /span -->
<script src="${path}/static/js/dict.js"></script>

13
power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml
Unescape Escape View File

@ -23,8 +23,7 @@
<resultMap id="BaseResultMapVo" type="com.manage.vo.Power_Sys_DictVo">
<result column="sys_name" jdbcType="VARCHAR" property="sysName"/>
<result column="dict_status" jdbcType="INTEGER" property="dictStatus"/>
<result column="dept_name" jdbcType="INTEGER" property="deptName"/>
<result column="userName" jdbcType="VARCHAR" property="userName"/>
<result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
</resultMap>
<sql id="Base_Column_List">
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
</select>
<!--查询全部-->
@ -369,10 +368,10 @@
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

12
power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java
Unescape Escape View File

@ -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() != 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));
}
}

Write Preview
Loading…
Cancel
Save