From 6438f805266954874a2ddf345cd6e776f5854b0d Mon Sep 17 00:00:00 2001 From: dhb52 <dhb52@126.com> Date: 星期一, 08 四月 2024 13:57:14 +0800 Subject: [PATCH] fix: easy-retry 3.2.0升级修复 1. SQLServer,Oracle的IDENTITY字段不能插入值 2. SQLServer er_system_user_=> er_system_user 3. ruoyi-admin增加token配置 --- 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 55c9b37..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 * 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