部门树数据权限控制

base-common/src/main/java/com/ozs/common/core/domain/vo/SysDeptVo.java

@@ -0,0 +1,66 @@
+package com.ozs.common.core.domain.vo;
+
+
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 部门
+ *
+ * @author hx
+ */
+@Data
+public class SysDeptVo extends PageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+    
+    private String deptName;
+
+    /**
+     * 部门编码
+     */
+    private String deptCode;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private String leader;
+
+    private String phone;
+
+    private String email;
+
+    /**
+     * 部门状态:1=正常,2=停用
+     */
+    private String status;
+
+    /**
+     * 删除标志（1代表存在 2代表删除）
+     */
+    private String delFlag;
+}

base-system/src/main/java/com/ozs/system/mapper/SysDeptMapper.java

@@ -2,6 +2,7 @@ package com.ozs.system.mapper;
 
 import java.util.List;
 
+import com.ozs.common.core.domain.vo.SysDeptVo;
 import com.ozs.system.domain.SysConfig;
 import icu.mhb.mybatisplus.plugln.base.mapper.JoinBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,10 +19,10 @@ public interface SysDeptMapper extends JoinBaseMapper<SysDept> {
     /**
      * 查询部门管理数据
      *
-     * @param dept 部门信息
+     * @param 
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+    public List<SysDept> selectDeptList(SysDeptVo sysDeptVo);
 
     public List<SysDept> selectDeptListAll(SysDept dept);
 

base-system/src/main/java/com/ozs/system/service/ISysDeptService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ozs.common.core.domain.TreeSelect;
 import com.ozs.common.core.domain.entity.SysDept;
+import com.ozs.common.core.domain.vo.SysDeptVo;
 import icu.mhb.mybatisplus.plugln.base.service.JoinIService;
 
 /**
@@ -15,10 +16,10 @@ public interface ISysDeptService extends JoinIService<SysDept> {
     /**
      * 查询部门管理数据
      *
-     * @param dept 部门信息
+     * @param  
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+    public List<SysDept> selectDeptList(SysDeptVo sysDeptVo);
 
     /**
      * 查询部门管理数据
@@ -31,10 +32,10 @@ public interface ISysDeptService extends JoinIService<SysDept> {
     /**
      * 查询部门树结构信息
      *
-     * @param dept 部门信息
+     * @param  部门信息
      * @return 部门树信息集合
      */
-    public List<TreeSelect> selectDeptTreeList(SysDept dept);
+    public List<TreeSelect> selectDeptTreeList(SysDeptVo sysDeptVo);
 
     /**
      * 构建前端所需要树结构

base-system/src/main/java/com/ozs/system/service/impl/SysDeptServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.ozs.common.core.domain.vo.SysDeptVo;
 import com.ozs.system.domain.SysConfig;
 import com.ozs.system.mapper.SysConfigMapper;
 import com.ozs.system.service.ISysConfigService;
@@ -43,13 +44,13 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
     /**
      * 查询部门管理数据
      *
-     * @param dept 部门信息
+     * @param  
      * @return 部门信息集合
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept) {
-        return deptMapper.selectDeptList(dept);
+    public List<SysDept> selectDeptList(SysDeptVo sysDeptVo) {
+        return deptMapper.selectDeptList(sysDeptVo);
     }
 
     /**
@@ -67,12 +68,12 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
     /**
      * 查询部门树结构信息
      *
-     * @param dept 部门信息
+     * @param  
      * @return 部门树信息集合
      */
     @Override
-    public List<TreeSelect> selectDeptTreeList(SysDept dept) {
-        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+    public List<TreeSelect> selectDeptTreeList(SysDeptVo sysDeptVo) {
+        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(sysDeptVo);
         return buildDeptTreeSelect(depts);
     }
 
@@ -198,7 +199,7 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
     @Override
     public void checkDeptDataScope(Long deptId) {
         if (!SysUser.isAdmin(SecurityUtils.getId())) {
-            SysDept dept = new SysDept();
+            SysDeptVo dept = new SysDeptVo();
             dept.setDeptId(deptId);
             List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
             if (StringUtils.isEmpty(depts)) {

base-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -1,78 +1,95 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
-		<result property="parentId"   column="parent_id"   />
-		<result property="ancestors"  column="ancestors"   />
-		<result property="deptName"   column="dept_name"   />
-		<result property="orderNum"   column="order_num"   />
-		<result property="leader"     column="leader"      />
-		<result property="phone"      column="phone"       />
-		<result property="email"      column="email"       />
-		<result property="status"     column="status"      />
-		<result property="delFlag"    column="del_flag"    />
-		<result property="parentName" column="parent_name" />
-		<result property="createBy"   column="create_by"   />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy"   column="update_by"   />
-		<result property="updateTime" column="update_time" />
-		<result property="deptCode"   column="dept_code"   />
-	</resultMap>
-
-	<sql id="selectDeptVo">
+    <resultMap type="SysDept" id="SysDeptResult">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="deptCode" column="dept_code"/>
+    </resultMap>
+
+    <sql id="selectDeptVo">
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dept_code
         from sys_dept d
     </sql>
 
-	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+    <select id="selectDeptList" resultType="com.ozs.common.core.domain.vo.SysDeptVo" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
-		where d.del_flag = '1'
-		and  d.status='1'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
-		<if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
-		</if>
-		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
-		</if>
-		order by d.parent_id, d.order_num
-	</select>
-
-	<select id="selectDeptListAll" parameterType="SysDept" resultMap="SysDeptResult">
-		<include refid="selectDeptVo"/>
-		where d.del_flag = '1'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
-		<if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
-		</if>
-		<if test="status != null and status != ''">
-			AND status = #{status}
-		</if>
-		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
-		</if>
-		order by d.parent_id, d.order_num
-	</select>
-
-	<select id="selectDeptListByRoleId" resultType="Long">
-		select d.dept_id
-		from sys_dept d
-		left join sys_role_dept rd on d.dept_id = rd.dept_id
-		where rd.role_id = #{roleId}
-		<if test="deptCheckStrictly">
-			and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
-			rd.dept_id and rd.role_id = #{roleId})
-		</if>
-		order by d.parent_id, d.order_num
-	</select>
+        where d.del_flag = '1'
+        and d.status='1'
+        <if test="deptId != null and deptId != 0">
+            AND dept_id = #{deptId}
+        </if>
+        <if test="parentId != null and parentId != 0">
+            AND parent_id = #{parentId}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND dept_name like concat('%', #{deptName}, '%')
+        </if>
+        <if test="!dsFlay">
+            and
+            <trim prefix="(" prefixOverrides="or" suffix=")">
+                <if test="dsUserId != null and dsUserId != ''">
+                    or d.create_by=#{dsUserId}
+                </if>
+                <if test="dsDeptId != null and dsDeptId != 0">
+                    or d.dept_id=#{dsDeptId}
+                </if>
+                <if test="dsDeptIds != null">
+                    or d.dept_id in
+                    <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                        #{item}
+                    </foreach>
+                </if>
+            </trim>
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
+
+    <select id="selectDeptListAll" parameterType="SysDept" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where d.del_flag = '1'
+        <if test="deptId != null and deptId != 0">
+            AND dept_id = #{deptId}
+        </if>
+        <if test="parentId != null and parentId != 0">
+            AND parent_id = #{parentId}
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND dept_name like concat('%', #{deptName}, '%')
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
+
+    <select id="selectDeptListByRoleId" resultType="Long">
+        select d.dept_id
+        from sys_dept d
+        left join sys_role_dept rd on d.dept_id = rd.dept_id
+        where rd.role_id = #{roleId}
+        <if test="deptCheckStrictly">
+            and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.dept_code,
@@ -81,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where d.dept_id = #{deptId}
 	</select>
 
-	<select id="selectDeptByDeptName" parameterType="string" resultMap="SysDeptResult">
+    <select id="selectDeptByDeptName" parameterType="string" resultMap="SysDeptResult">
 		select * from sys_dept where dept_name = #{deptName}
 	</select>
 
@@ -92,14 +109,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  and del_flag = 1
 	</select>
 
-	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
+    <select id="hasChildByDeptId" parameterType="Long" resultType="int">
 		select count(1)
 		from sys_dept
 		where del_flag = 1
 		  and parent_id = #{deptId} limit 1
 	</select>
 
-	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
+    <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select *
 		from sys_dept
 		where find_in_set(#{deptId}, ancestors)
@@ -107,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  and del_flag = 1
 	</select>
 
-	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
+    <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 		select count(*)
 		from sys_dept
 		where status = 1
@@ -115,80 +132,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  and find_in_set(#{deptId}, ancestors)
 	</select>
 
-	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
-	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = 1 limit 1
-	</select>
+    <select id="checkDeptNameUnique" resultMap="SysDeptResult">
+        <include refid="selectDeptVo"/>
+        where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = 1 limit 1
+    </select>
 
     <insert id="insertDept" parameterType="SysDept">
- 		insert into sys_dept(
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
- 			<if test="parentId != null and parentId != 0">parent_id,</if>
- 			<if test="deptName != null and deptName != ''">dept_name,</if>
- 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
- 			<if test="orderNum != null">order_num,</if>
- 			<if test="leader != null and leader != ''">leader,</if>
- 			<if test="phone != null and phone != ''">phone,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="status != null">status,</if>
-		    <if test="deptCode != null and deptCode != ''">dept_code,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</if>
- 			<if test="parentId != null and parentId != 0">#{parentId},</if>
- 			<if test="deptName != null and deptName != ''">#{deptName},</if>
- 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- 			<if test="orderNum != null">#{orderNum},</if>
- 			<if test="leader != null and leader != ''">#{leader},</if>
- 			<if test="phone != null and phone != ''">#{phone},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="status != null">#{status},</if>
-		    <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-
-	<update id="updateDept" parameterType="SysDept">
- 		update sys_dept
- 		<set>
- 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- 			<if test="orderNum != null">order_num = #{orderNum},</if>
- 			<if test="leader != null">leader = #{leader},</if>
- 			<if test="phone != null">phone = #{phone},</if>
- 			<if test="email != null">email = #{email},</if>
-			<if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
-			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dept_id = #{deptId}
-	</update>
-
-	<update id="updateDeptChildren" parameterType="java.util.List">
-	    update sys_dept set ancestors =
-	    <foreach collection="depts" item="item" index="index"
-	        separator=" " open="case dept_id" close="end">
-	        when #{item.deptId} then #{item.ancestors}
-	    </foreach>
-	    where dept_id in
-	    <foreach collection="depts" item="item" index="index"
-	        separator="," open="(" close=")">
-	        #{item.deptId}
-	    </foreach>
-	</update>
-
-	<update id="updateDeptStatusNormal" parameterType="Long">
-		update sys_dept set status = 1 where dept_id in
-		<foreach collection="array" item="deptId" open="(" separator="," close=")">
-        	#{deptId}
+        insert into sys_dept(
+        <if test="deptId != null and deptId != 0">dept_id,</if>
+        <if test="parentId != null and parentId != 0">parent_id,</if>
+        <if test="deptName != null and deptName != ''">dept_name,</if>
+        <if test="ancestors != null and ancestors != ''">ancestors,</if>
+        <if test="orderNum != null">order_num,</if>
+        <if test="leader != null and leader != ''">leader,</if>
+        <if test="phone != null and phone != ''">phone,</if>
+        <if test="email != null and email != ''">email,</if>
+        <if test="status != null">status,</if>
+        <if test="deptCode != null and deptCode != ''">dept_code,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="deptId != null and deptId != 0">#{deptId},</if>
+        <if test="parentId != null and parentId != 0">#{parentId},</if>
+        <if test="deptName != null and deptName != ''">#{deptName},</if>
+        <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
+        <if test="orderNum != null">#{orderNum},</if>
+        <if test="leader != null and leader != ''">#{leader},</if>
+        <if test="phone != null and phone != ''">#{phone},</if>
+        <if test="email != null and email != ''">#{email},</if>
+        <if test="status != null">#{status},</if>
+        <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
+    </insert>
+
+    <update id="updateDept" parameterType="SysDept">
+        update sys_dept
+        <set>
+            <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
+            <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
+            <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="leader != null">leader = #{leader},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="deptCode != null and deptCode != ''">dept_code=#{deptCode},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            update_time = sysdate()
+        </set>
+        where dept_id = #{deptId}
+    </update>
+
+    <update id="updateDeptChildren" parameterType="java.util.List">
+        update sys_dept set ancestors =
+        <foreach collection="depts" item="item" index="index"
+                 separator=" " open="case dept_id" close="end">
+            when #{item.deptId} then #{item.ancestors}
+        </foreach>
+        where dept_id in
+        <foreach collection="depts" item="item" index="index"
+                 separator="," open="(" close=")">
+            #{item.deptId}
+        </foreach>
+    </update>
+
+    <update id="updateDeptStatusNormal" parameterType="Long">
+        update sys_dept set status = 1 where dept_id in
+        <foreach collection="array" item="deptId" open="(" separator="," close=")">
+            #{deptId}
         </foreach>
-	</update>
+    </update>
 
-	<delete id="deleteDeptById" parameterType="Long">
+    <delete id="deleteDeptById" parameterType="Long">
 		update sys_dept
 		set del_flag = 2
 		where dept_id = #{deptId}