From f3521f47792568ac6bbd7920e7fe7973f348392f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E6=87=BF?= <1509159964@qq.com> Date: Tue, 19 May 2020 12:00:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=A8=E6=88=B7=E5=88=86=E9=85=8D=E8=B0=83?= =?UTF-8?q?=E9=98=85=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/manage/vo/Power_Sys_DictVo.java | 10 + .../resources/mapper/Power_Sys_DictMapper.xml | 878 +++++++++--------- .../resources/mapper/Power_UserMapper.xml | 1 + .../manage/service/ipml/PowerServiceImpl.java | 4 +- 4 files changed, 457 insertions(+), 436 deletions(-) diff --git a/power-dao/src/main/java/com/manage/vo/Power_Sys_DictVo.java b/power-dao/src/main/java/com/manage/vo/Power_Sys_DictVo.java index 0eb6b2b..0e39705 100644 --- a/power-dao/src/main/java/com/manage/vo/Power_Sys_DictVo.java +++ b/power-dao/src/main/java/com/manage/vo/Power_Sys_DictVo.java @@ -17,6 +17,8 @@ public class Power_Sys_DictVo extends Power_Sys_Dict { private String deptIds; + private String userName; + public Integer getHospitalId() { return hospitalId; } @@ -78,4 +80,12 @@ public class Power_Sys_DictVo extends Power_Sys_Dict { public void setDeptName(String deptName) { this.deptName = deptName; } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } } 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 9ef4158..768c3be 100644 --- a/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml +++ b/power-dao/src/main/resources/mapper/Power_Sys_DictMapper.xml @@ -1,36 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + dict_id, dept_id, hospital_name, sys_flag, sys_name, dict_area, hospital_tel, parent_id, sys_type, sort, dict_status, dict_edit, create_date, creater, update_date, updater, remark - SELECT power_sys_dict.dict_id, power_sys_dict.dept_id, @@ -55,11 +56,11 @@ LEFT JOIN power_sys_dict power_sys_dict1 ON power_sys_dict.parent_id = power_sys_dict1.dict_id WHERE power_sys_dict.dict_id = #{dictId,jdbcType=INTEGER} - + delete from power_sys_dict where dict_id = #{dictId,jdbcType=INTEGER} - + insert into power_sys_dict (dict_id, dept_id, hospital_name, sys_flag, sys_name, dict_area, hospital_tel, parent_id, sys_type, @@ -73,170 +74,171 @@ #{createDate,jdbcType=CHAR}, #{creater,jdbcType=VARCHAR}, #{updateDate,jdbcType=CHAR}, #{updater,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}) - - insert into power_sys_dict - - - dict_id, - - - dept_id, - - - hospital_name, - - - sys_flag, - - - sys_name, - - - dict_area, - - - hospital_tel, - - - parent_id, - - - sys_type, - - - sort, - - - dict_status, - - - dict_edit, - - - create_date, - - - creater, - - - update_date, - - - updater, - - - remark, - - - - - #{dictId,jdbcType=INTEGER}, - - - #{deptId,jdbcType=INTEGER}, - - - #{hospitalName,jdbcType=VARCHAR}, - - - #{sysFlag,jdbcType=VARCHAR}, - - - #{sysName,jdbcType=VARCHAR}, - - - #{dictArea,jdbcType=VARCHAR}, - - - #{hospitalTel,jdbcType=VARCHAR}, - - - #{parentId,jdbcType=INTEGER}, - - - #{sysType,jdbcType=VARCHAR}, - - - #{sort,jdbcType=INTEGER}, - - - #{dictStatus,jdbcType=INTEGER}, - - - #{dictEdit,jdbcType=INTEGER}, - - - #{createDate,jdbcType=CHAR}, - - - #{creater,jdbcType=VARCHAR}, - - - #{updateDate,jdbcType=CHAR}, - - - #{updater,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - - - update power_sys_dict - - - dept_id = #{deptId,jdbcType=INTEGER}, - - - hospital_name = #{hospitalName,jdbcType=VARCHAR}, - - - sys_flag = #{sysFlag,jdbcType=VARCHAR}, - - - sys_name = #{sysName,jdbcType=VARCHAR}, - - - dict_area = #{dictArea,jdbcType=VARCHAR}, - - - hospital_tel = #{hospitalTel,jdbcType=VARCHAR}, - - - parent_id = #{parentId,jdbcType=INTEGER}, - - - sys_type = #{sysType,jdbcType=VARCHAR}, - - - sort = #{sort,jdbcType=INTEGER}, - - - dict_status = #{dictStatus,jdbcType=INTEGER}, - - - dict_edit = #{dictEdit,jdbcType=INTEGER}, - - - create_date = #{createDate,jdbcType=CHAR}, - - - creater = #{creater,jdbcType=VARCHAR}, - - - update_date = #{updateDate,jdbcType=CHAR}, - - - updater = #{updater,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - where dict_id = #{dictId,jdbcType=INTEGER} - - + + insert into power_sys_dict + + + dict_id, + + + dept_id, + + + hospital_name, + + + sys_flag, + + + sys_name, + + + dict_area, + + + hospital_tel, + + + parent_id, + + + sys_type, + + + sort, + + + dict_status, + + + dict_edit, + + + create_date, + + + creater, + + + update_date, + + + updater, + + + remark, + + + + + #{dictId,jdbcType=INTEGER}, + + + #{deptId,jdbcType=INTEGER}, + + + #{hospitalName,jdbcType=VARCHAR}, + + + #{sysFlag,jdbcType=VARCHAR}, + + + #{sysName,jdbcType=VARCHAR}, + + + #{dictArea,jdbcType=VARCHAR}, + + + #{hospitalTel,jdbcType=VARCHAR}, + + + #{parentId,jdbcType=INTEGER}, + + + #{sysType,jdbcType=VARCHAR}, + + + #{sort,jdbcType=INTEGER}, + + + #{dictStatus,jdbcType=INTEGER}, + + + #{dictEdit,jdbcType=INTEGER}, + + + #{createDate,jdbcType=CHAR}, + + + #{creater,jdbcType=VARCHAR}, + + + #{updateDate,jdbcType=CHAR}, + + + #{updater,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + + + update power_sys_dict + + + dept_id = #{deptId,jdbcType=INTEGER}, + + + hospital_name = #{hospitalName,jdbcType=VARCHAR}, + + + sys_flag = #{sysFlag,jdbcType=VARCHAR}, + + + sys_name = #{sysName,jdbcType=VARCHAR}, + + + dict_area = #{dictArea,jdbcType=VARCHAR}, + + + hospital_tel = #{hospitalTel,jdbcType=VARCHAR}, + + + parent_id = #{parentId,jdbcType=INTEGER}, + + + sys_type = #{sysType,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=INTEGER}, + + + dict_status = #{dictStatus,jdbcType=INTEGER}, + + + dict_edit = #{dictEdit,jdbcType=INTEGER}, + + + create_date = #{createDate,jdbcType=CHAR}, + + + creater = #{creater,jdbcType=VARCHAR}, + + + update_date = #{updateDate,jdbcType=CHAR}, + + + updater = #{updater,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + where dict_id = #{dictId,jdbcType=INTEGER} + + update power_sys_dict set dept_id = #{deptId,jdbcType=INTEGER}, hospital_name = #{hospitalName,jdbcType=VARCHAR}, @@ -259,7 +261,7 @@ - SELECT dict.dict_id dictId, dict.parent_id parentId, @@ -360,7 +362,7 @@ AND dict.dict_status = 1 AND dept.effective = 1 - SELECT dict.dict_id dictId, dict.parent_id parentId, @@ -372,7 +374,8 @@ dict.sys_type sysType, dept.dept_name deptName, dict.hospital_tel, - dict.dict_area + dict.dict_area, + dept.creater username FROM power_sys_dict dict LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id @@ -389,7 +392,8 @@ select power_role.role_name sysType, null as deptName, power_user.user_tel hospital_tel, - power_user.user_name as dict_area + power_user.user_name as dict_area, + power_user.name as username from power_user LEFT JOIN (SELECT dict.dict_id dictId, @@ -402,7 +406,8 @@ LEFT JOIN (SELECT dict.sys_type sysType, dept.dept_name deptName, dict.hospital_tel, - dict.dict_area + dict.dict_area, + dept.creater username FROM power_sys_dict dict LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id @@ -410,6 +415,7 @@ LEFT JOIN (SELECT on FIND_IN_SET(dict.deptIds,power_user.dept_id) inner join power_role on power_role.role_id = power_user.role_id and power_role.effective = 1 and power_role.role_id != 0 and power_role.role_id != -100 where dict.deptIds is not null and power_user.effective = 1 + - SELECT DISTINCT dict.dict_id dictId, dict.parent_id parentId, @@ -541,169 +547,172 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id) LEFT JOIN power_dept dept ON dict.dept_id = dept.dept_id - - - + SELECT DISTINCT + dict.dict_id dictId, + dict.parent_id parentId, + dict.dept_id dictDeptId, + dept.dept_id deptIds, + dict.hospital_name hospitalName, + dict.sys_name sysName, + dict.sys_flag sysFlag, + dict.sys_type sysType, + dept.dept_name deptName, + dict.hospital_tel, + dict.dict_area, + dept.creater username + FROM + ( + SELECT + dict_id, + parent_id, + dept_id, + hospital_name, + sys_name, + sys_flag, + hospital_tel, + dict_area, + sys_type + FROM + power_sys_dict + WHERE + dict_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + OR parent_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + UNION ALL + SELECT + power_sys_dict.dict_id, + power_dept.dict_id parent_id, + power_dept.dept_id, + power_sys_dict.hospital_name, + power_sys_dict.sys_name, + power_sys_dict.sys_flag, + power_sys_dict.hospital_tel, + power_sys_dict.dict_area, + power_sys_dict.sys_type + FROM + power_dept + LEFT JOIN power_sys_dict ON power_dept.dept_id = power_sys_dict.dept_id + WHERE + power_dept.dict_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + ) dict + LEFT JOIN power_dept dept ON dict.dept_id = dept.dept_id + union all + select + null as dictId, + power_user.role_id, + power_user.user_id dictDeptId, + power_user.dept_id deptIds, + null as hospitalName, + power_user.user_id as sysName, + null as sysFlag, + power_role.role_name sysType, + null as deptName, + power_user.user_tel hospital_tel, + power_user.user_name as dict_area, + power_user.name as username + from power_user + left join (SELECT DISTINCT + dict.dict_id dictId, + dict.parent_id parentId, + dict.dept_id dictDeptId, + dept.dept_id deptIds, + dict.hospital_name hospitalName, + dict.sys_name sysName, + dict.sys_flag sysFlag, + dict.sys_type sysType, + dept.dept_name deptName, + dict.hospital_tel, + dict.dict_area + FROM + ( + SELECT + dict_id, + parent_id, + dept_id, + hospital_name, + sys_name, + sys_flag, + hospital_tel, + dict_area, + sys_type + FROM + power_sys_dict + WHERE + dict_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + OR parent_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + UNION ALL + SELECT + power_sys_dict.dict_id, + power_dept.dict_id parent_id, + power_dept.dept_id, + power_sys_dict.hospital_name, + power_sys_dict.sys_name, + power_sys_dict.sys_flag, + power_sys_dict.hospital_tel, + power_sys_dict.dict_area, + power_sys_dict.sys_type + FROM + power_dept + LEFT JOIN power_sys_dict ON power_dept.dept_id = power_sys_dict.dept_id + WHERE + power_dept.dict_id = ( + SELECT + dict_id + FROM + power_user_dict + WHERE + user_id = #{userId} + ) + ) dict + LEFT JOIN power_dept dept ON dict.dept_id = dept.dept_id + ) dict on FIND_IN_SET(dict.deptIds,power_user.dept_id) + inner join power_role on power_role.role_id = power_user.role_id and power_role.effective = 1 and + power_role.role_id != 0 and power_role.role_id != -100 + where dict.deptIds is not null and power_user.effective = 1 + + AND power_user.user_id != #{userId} + + + AND power_user.role_id != #{roleId} + + + + - - SELECT dict_id FROM @@ -720,57 +729,57 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id) WHERE hospital_name = #{hospitalName} - - + SELECT dict_id, hospital_name, hospital_tel, dict_area - FROM + FROM power_sys_dict - WHERE + WHERE parent_id = ${parentId} AND sys_type = #{sysType} - - - + + + WHERE + + (sys_flag = #{sysFlag} OR sys_name = #{sysName}) + + + AND dept_id IN (${deptIds}) + + - + SELECT dict_id, dept_id, sys_flag, sys_name, parent_id - FROM + FROM power_sys_dict - WHERE - - (sys_flag = #{sysFlag} OR sys_name = #{sysName}) - - - AND dept_id IN (${deptIds}) - - + WHERE + + (sys_flag = #{sysFlag} OR sys_name = #{sysName}) + + + AND dept_id IN (${deptIds}) + + INSERT INTO power_sys_dict( - dict_id, - dept_id, - hospital_name, - sys_flag, - sys_name, - dict_area, - hospital_tel, - parent_id, - sys_type, - sort, - dict_status, - dict_edit, - create_date, - creater, - update_date, - updater, - remark) + dict_id, + dept_id, + hospital_name, + sys_flag, + sys_name, + dict_area, + hospital_tel, + parent_id, + sys_type, + sort, + dict_status, + dict_edit, + create_date, + creater, + update_date, + updater, + remark) VALUES - + ( #{item.dictId,jdbcType=INTEGER}, #{item.deptId,jdbcType=INTEGER}, @@ -893,7 +903,7 @@ on FIND_IN_SET(dict.deptIds,power_user.dept_id) #{item.updater,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR} ) - + 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 0834cfb..f8a5ea2 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 @@ -965,9 +965,9 @@ public class PowerServiceImpl implements PowerService { tree4.setId(id); tree4.setParentId(twoLevel); if(StringUtils.isNotBlank(map.getValue().getHospitalTel())){ - tree4.setName(map.getValue().getSysName()+"-"+map.getValue().getDictArea()+"("+map.getValue().getHospitalTel()+")"); + tree4.setName(map.getValue().getUserName()+"-"+map.getValue().getDictArea()+"("+map.getValue().getHospitalTel()+")"); }else{ - tree4.setName(map.getValue().getSysName()+"-"+map.getValue().getDictArea()); + tree4.setName(map.getValue().getUserName()+"-"+map.getValue().getDictArea()); } tree4.setSelfId(map.getKey()); tree4.setRoleId(map.getValue().getParentId());