From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
index 5605c44..afcef79 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -27,20 +27,22 @@
 	
 	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
-		<where>
-			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
-			</if>
-			<if test="jobGroup != null and jobGroup != ''">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
-			</if>
-		</where>
+		where 1=1
+		<if test="orgid != null and orgid != ''">
+			AND orgid = #{orgid}
+		</if>
+		<if test="jobName != null and jobName != ''">
+			AND job_name like concat('%', #{jobName}, '%')
+		</if>
+		<if test="jobGroup != null and jobGroup != ''">
+			AND job_group = #{jobGroup}
+		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
+		<if test="invokeTarget != null and invokeTarget != ''">
+			AND invoke_target like concat('%', #{invokeTarget}, '%')
+		</if>
 	</select>
 	
 	<select id="selectJobAll" resultMap="SysJobResult">

--
Gitblit v1.9.3