Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-27 4aaab689ed4e94dd9e34ec22c661b3227befe8a8

 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>