From 8b0a0ddf2b8cbd19b0e5d5439b446e79fb6e26b9 Mon Sep 17 00:00:00 2001
From: ifangng <ifangngorz@gmail.com>
Date: Thu, 18 Jan 2024 11:08:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E9=80=9A=E8=BF=87=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=20(#33)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果在用户管理页面选择一个顶级部门，最终SQL条件为：WHERE u.dept_id = 7 AND u.dept_id in ( 17 , 2 , 5 , 7 )，用户如果不在顶级部门，会查询不到，在Controller代码中已经将父节点和子节点都添加在了集合中，所以可以去除u.dept_id = #{criteria.deptId} 条件。

Co-authored-by: ifangng <ifangnorz@gmail.com>
---
 .../src/main/resources/mapper/system/UserMapper.xml            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
index e6fbbaf..6bb3ec8 100644
--- a/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/eladmin/eladmin-system/src/main/resources/mapper/system/UserMapper.xml
@@ -60,9 +60,6 @@
             <if test="criteria.enabled != null">
                 and u.enabled = #{criteria.enabled}
             </if>
-            <if test="criteria.deptId != null">
-                and u.dept_id = #{criteria.deptId}
-            </if>
             <if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
                 and u.dept_id in
                 <foreach collection="criteria.deptIds" item="deptId" open="(" separator="," close=")">

From bd7bec06a044b6f0455fc72dc47f338943ff6e54 Mon Sep 17 00:00:00 2001
From: ChiuJun <42403968+ChiuJun@users.noreply.github.com>
Date: Wed, 7 Feb 2024 17:58:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20QuartzLogMapper=E5=8A=A8=E6=80=81SQL?=
 =?UTF-8?q?=E5=B8=83=E5=B0=94=E7=B1=BB=E5=9E=8B=E6=B5=8B=E8=AF=95=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF=20(#34)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/quartz/QuartzLogMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eladmin/eladmin-system/src/main/resources/mapper/quartz/QuartzLogMapper.xml b/eladmin/eladmin-system/src/main/resources/mapper/quartz/QuartzLogMapper.xml
index 7885b14..1c3a71c 100644
--- a/eladmin/eladmin-system/src/main/resources/mapper/quartz/QuartzLogMapper.xml
+++ b/eladmin/eladmin-system/src/main/resources/mapper/quartz/QuartzLogMapper.xml
@@ -27,7 +27,7 @@
             <if test="criteria.jobName != null and criteria.jobName != ''">
                 AND job_name LIKE CONCAT('%',#{criteria.jobName},'%')
             </if>
-            <if test="criteria.isSuccess != null and criteria.isSuccess != ''">
+            <if test="criteria.isSuccess != null">
                 AND is_success = #{criteria.isSuccess}
             </if>
             <if test="criteria.createTime != null and criteria.createTime.size() > 0">