From 4aaab689ed4e94dd9e34ec22c661b3227befe8a8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 18:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/LightTaskMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightTaskMapper.xml b/dao/src/main/resources/mapper/LightTaskMapper.xml
index 71c63ef..cebc022 100644
--- a/dao/src/main/resources/mapper/LightTaskMapper.xml
+++ b/dao/src/main/resources/mapper/LightTaskMapper.xml
@@ -9,6 +9,7 @@
<result property="clientId" column="client_id" jdbcType="BIGINT"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="taskName" column="task_name" jdbcType="VARCHAR"/>
+ <result property="lightAdress" column="light_adress" jdbcType="VARCHAR"/>
<result property="pause" column="pause" jdbcType="TINYINT"/>
<result property="week" column="week" jdbcType="TINYINT"/>
<result property="openOrder" column="open_order" jdbcType="VARCHAR"/>
@@ -31,9 +32,11 @@
parameterType="java.lang.Long">
SELECT t1.*
FROM light_task t1
- LEFT JOIN light_task_pole_relation t2 ON t1.task_id = t2.task_id
- LEFT JOIN pole t3 ON t2.pole_id = t3.id
+ LEFT JOIN light_task_pole_relation t2 ON t1.task_id = t2.task_id
+ LEFT JOIN pole t3 ON t2.pole_id = t3.id
WHERE t2.issue_status = 0
- AND (t3.user_id = #{userId} or t3.client_id = #{userId})
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3