From bf617a84938f6b6c6facb9fa77889f53fc0c27e6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 19 Feb 2022 11:17:35 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..0c3edd9 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>
 
 
@@ -53,16 +55,19 @@
 
     <select id="selectLi" resultMap="taskResultMap">
         SELECT A.*,IFNULL(B.num,0) as nums FROM (
-        select qd.* from sys_taskqd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1
+        select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1 AND qd.jnum!=qd.num
         <if test="type==0">
             and find_in_set(#{serid}, serid)) 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>
         <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
+            <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+                and (j.id =#{jurisdiction} or
+                j.parent_id = #{jurisdiction})
+            </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
+            as num,hdid FROM sys_taskfk GROUP BY hdid) B ON A.id=B.hdid
         </if>
     </select>
 </mapper>

--
Gitblit v1.9.3