From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index bba949d..9057a0e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -8,11 +8,29 @@
</resultMap>
<select id="selectDeptList" resultMap="SysDeptResult">
- select * from sys_dept ${ew.getCustomSqlSegment}
+ select
+ <if test="ew.getSqlSelect != null">
+ ${ew.getSqlSelect}
+ </if>
+ <if test="ew.getSqlSelect == null">
+ *
+ </if>
+ from sys_dept ${ew.getCustomSqlSegment}
</select>
- <select id="selectDeptById" resultMap="SysDeptResult">
- select * from sys_dept where del_flag = '0' and dept_id = #{deptId}
+ <select id="selectPageDeptList" resultMap="SysDeptResult">
+ select
+ <if test="ew.getSqlSelect != null">
+ ${ew.getSqlSelect}
+ </if>
+ <if test="ew.getSqlSelect == null">
+ *
+ </if>
+ from sys_dept ${ew.getCustomSqlSegment}
+ </select>
+
+ <select id="countDeptById" resultType="Long">
+ select count(*) from sys_dept where del_flag = '0' and dept_id = #{deptId}
</select>
<select id="selectDeptListByRoleId" resultType="Long">
--
Gitblit v1.9.3