From eb39b40f6fe87a4990419af4e39a68e13bc09678 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 18 Feb 2022 16:19:41 +0800
Subject: [PATCH] 任务管理
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 0d2d028..ab713c5 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -21,6 +21,8 @@
<result column="team" property="team"/>
<result column="iscation" property="iscation"/>
<result column="publisher" property="publisher"/>
+ <result column="fid" property="fid"/>
+ <result column="fname" property="fname"/>
</resultMap>
@@ -59,8 +61,12 @@
serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
- and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid )) and (j.id =#{jurisdiction} or
- j.parent_id = #{jurisdiction}) AND qd.jnum!=qd.num ) A LEFT JOIN (SELECT
+ and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid ))
+ <if test="jurisdiction!=null and jurisdiction!=''">
+ and (j.id =#{jurisdiction} or
+ j.parent_id = #{jurisdiction}) AND qd.jnum!=qd.num
+ </if>
+ ) A LEFT JOIN (SELECT
COUNT(*)
as num,hdid,serid FROM sys_taskfk WHERE serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
--
Gitblit v1.9.3