From d86652dee1d6a29af7e3ce2f6dd448aec3174321 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 19 九月 2024 13:55:46 +0800 Subject: [PATCH] update easyexcel 4.0.2 => 4.0.3 update redisson 3.34.1 => 3.36.0 --- ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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 48a4226..6ad866f 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,7 +8,14 @@ </resultMap> <select id="selectDeptList" resultMap="SysDeptResult"> - select ${ew.getSqlSelect} 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="countDeptById" resultType="Long"> -- Gitblit v1.9.3