From 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 一月 2026 18:07:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/system/SysDeptMapper.xml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index 5c6310a..afc1130 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -20,32 +20,37 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="staffCount" column="staff_count" />
</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
from sys_dept d
</sql>
-
+
<select id="selectDeptList" parameterType="com.ruoyi.project.system.domain.SysDept" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where d.del_flag = '0'
+ 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,
+ count(distinct soj.id) as staff_count
+ from sys_dept d
+ left join staff_on_job soj on soj.sys_dept_id = d.dept_id and soj.staff_state = '1'
+ where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
- AND dept_id = #{deptId}
+ AND d.dept_id = #{deptId}
</if>
- <if test="parentId != null and parentId != 0">
- AND parent_id = #{parentId}
+ <if test="parentId != null and parentId != 0">
+ AND d.parent_id = #{parentId}
</if>
<if test="deptName != null and deptName != ''">
- AND dept_name like concat('%', #{deptName}, '%')
+ AND d.dept_name like concat('%', #{deptName}, '%')
</if>
<if test="status != null and status != ''">
- AND status = #{status}
+ AND d.status = #{status}
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
+ group by 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
order by d.parent_id, d.order_num
- </select>
+ </select>
<select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
--
Gitblit v1.9.3