显示停用状态单位

base-common/src/main/java/com/ozs/common/core/domain/entity/SysDept.java

@@ -61,9 +61,9 @@ public class SysDept extends BaseEntity {
     private String email;
 
     /**
-     * 部门状态:0正常,1停用
+     * 部门状态:1=正常,2=停用
      */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "状态", readConverterExp = "1=正常,2=停用")
     private String status;
 
     /**

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

@@ -23,6 +23,8 @@ public interface SysDeptMapper extends JoinBaseMapper<SysDept> {
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    public List<SysDept> selectDeptListAll(SysDept dept);
+
     /**
      * 根据角色ID查询部门树信息
      *

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

@@ -21,6 +21,14 @@ public interface ISysDeptService extends JoinIService<SysDept> {
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    public List<SysDept> selectDeptListAll(SysDept dept);
+
     /**
      * 查询部门树结构信息
      *

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

@@ -51,6 +51,18 @@ public class SysDeptServiceImpl extends JoinServiceImpl<SysDeptMapper, SysDept>
         return deptMapper.selectDeptList(dept);
     }
 
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    @Override
+    @DataScope(deptAlias = "d")
+    public List<SysDept> selectDeptListAll(SysDept dept) {
+        return deptMapper.selectDeptListAll(dept);
+    }
+
     /**
      * 查询部门树结构信息
      *

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

@@ -34,23 +34,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND dept_id = #{deptId}
 		</if>
-        <if test="parentId != null and parentId != 0">
+		<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>
+
+	<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="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 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>
+		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>