From 7722aa86f1a0e2aacbf2fd17203789619e1c64e3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 21 Feb 2022 19:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 51499f2..a34dc69 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -38,6 +38,11 @@
</if>
where id = #{id}
</update>
+ <update id="updateRtype">
+ update sys_taskqd
+ SET rtype=#{type}
+ where id = #{rid}
+ </update>
<!--日常任务列表-->
@@ -62,7 +67,7 @@
serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ <if test="jurisdiction!='1372091709474910209'">
and !find_in_set(#{serid}
, serid) and (j.id =#{jurisdiction} or
j.parent_id = #{jurisdiction})
--
Gitblit v1.9.3