src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -290,7 +290,7 @@ on si.departmentid = bd.id where 1=1 and bd.dept_category = 3 and si.stats = 1 <if test="information.deptName!=null and information.deptName!=''"> and bd.dept_name like concat(concat('%', #{information.deptName}),'%') </if> src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -137,7 +137,7 @@ @Param("deptId") Long deptId, @Param("jurisdiction")String jurisdiction); /** * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据 * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据 民警向民警汇报 * @return */ @MapKey(value = "id") src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -103,7 +103,24 @@ ORDER BY dept.sort </select> <!--查询保安公司列表，保安员管理--> <select id="securityLazyTree" resultMap="treeNodeResultMap" > ( SELECT id, parent_id, dept_name AS title, id AS "value", id AS "key", 0 AS "has_children" FROM blade_dept where is_deleted = 0 and (id = 1413470343230877697 or id = 1425366663452196865 or id = 1418458374477549569 or id = 1420222768149966850) ) union ( SELECT DISTINCT dept.id, @@ -127,13 +144,17 @@ si.departmentid = dept.id WHERE 1=1 and dept_category = 1 and si.stats != 4 AND dept.is_deleted = 0 and dept.id !=1420222961377357825 and dept.parent_id!=1420222961377357825 <if test="param1!=null and param1!='' and param1!='1123598813738675201'"> and dept.parent_id!=1425365577303621633 and dept.id != 1425365577303621633 and dept.id != 1432625856013971457 <if test="param1!=null and param1!='' and param1!='1372091709474910209'"> and si.jurisdiction = #{param1} </if> ) </select> <!--懒加载获取部门树形结构(按分类查询)--> @@ -311,7 +332,6 @@ )c </select> <!--懒加载获取部门树形结构(包含用户数据),未删除，在职--> <select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" > select DISTINCT @@ -339,9 +359,6 @@ si.departmentid = dept.id WHERE dept.is_deleted = 0 <if test="type==1"> and dept_category=1 </if> <if test="deptId!=null and deptId!=''"> and dept.id = #{deptId} </if> @@ -369,11 +386,7 @@ and bu.is_deleted = 0 and bu.status = 1 <if test="type==1"> and dept_category=1 and role_alias = '保安' </if> <if test="type==2 or type==3"> and dept_category=2 </if> <if test="deptId!=null and deptId!=''"> and bu.dept_id = #{deptId} @@ -412,9 +425,6 @@ si.departmentid = dept.id WHERE dept.is_deleted = 0 <if test="type==2 or type==3"> and dept_category=2 </if> <if test="deptId!=null and deptId!=''"> and (dept.parent_id = #{deptId} or dept.id = #{deptId}) </if> @@ -436,9 +446,7 @@ bd.id = bu.dept_id where 1=1 and bu.is_deleted = 0 <if test="type==2 or type==3"> and dept_category=2 </if> and bu.status = 1 <if test="deptId!=null and deptId!=''"> and (bd.parent_id = #{deptId} or bd.id = #{deptId}) </if> @@ -446,7 +454,7 @@ )c </select> <!--懒加载获取部门树形结构(包含用户数据)--> <!--懒加载获取部门树形结构(包含用户数据) 民警向民警汇报--> <select id="lazyTreeUsersPublicSecuritys" resultType="org.springblade.modules.system.node.TreeNodes" > select DISTINCT * @@ -473,8 +481,8 @@ si.departmentid = dept.id WHERE dept.is_deleted = 0 <if test="type==2 or type==3"> and dept_category=2 <if test="deptId!=null and deptId!=''"> and dept.id = #{deptId} </if> ) @@ -494,8 +502,9 @@ bd.id = bu.dept_id where 1=1 and bu.is_deleted = 0 <if test="type==2 or type==3"> and dept_category=2 and bu.status = 1 <if test="deptId!=null and deptId!=''"> and bd.id = #{deptId} </if> ) )c src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -75,6 +75,9 @@ br.id = bu.role_id where bu.is_deleted = 0 and bd.parent_id!=1425365577303621633 and bd.id != 1425365577303621633 and bd.id != 1432625856013971457 <if test="user.account!=null and user.account != ''"> and bu.account like concat('%', #{user.account},'%') </if> @@ -93,7 +96,7 @@ <if test="user.status!=null and user.status != ''"> and bu.status = #{user.status} </if> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'"> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'"> and si.jurisdiction = #{user.jurisdiction} </if> <if test="user.realName!=null and user.realName != ''"> @@ -219,7 +222,6 @@ br.id = bu.role_id where bu.is_deleted = 0 and bd.dept_category = 1 and role_alias = '保安' <if test="user.realName!=null and user.realName != ''"> and bu.real_name like concat(concat('%', #{user.realName}),'%') @@ -268,8 +270,6 @@ bu.dept_id = bd.id where bu.is_deleted = 0 and bd.dept_category = 1 and (hold = 2 or hold = 3) <if test="user.deptId!=null and user.deptId != ''"> @@ -324,7 +324,6 @@ bu.is_deleted = 0 and bu.status = 1 and bu.examination_type != 1 and bd.dept_category = 1 and (hold = 2 or hold = 3) and bd.id = #{user.deptId} <if test="user.examType==1"> src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -270,14 +270,14 @@ Dept dept = new Dept(); dept.setDeptName(jurisdiction.getDeptName()); Dept dept1 = this.getOne(Condition.getQueryWrapper(dept)); map = baseMapper.lazyTreeUsersPublicSecurity(type, dept1.getId(), one.getJurisdiction()); map = baseMapper.lazyTreeUsersPublicSecurity(null, dept1.getId(), one.getJurisdiction()); } } } //民警向民警汇报，需要南昌市及当前民警所在辖区的部门数据 if(type==3){ //当前取所有的民警数据 map = baseMapper.lazyTreeUsersPublicSecuritys(type,null,null); map = baseMapper.lazyTreeUsersPublicSecuritys(null,deptId,null); } List<TreeNodes> tree = new ArrayList<>(); Map<Long, TreeNodes> finalMap = map;
