From 7a852f6db3d9bb3908d55f0a49ff9e92b4062621 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Feb 2022 21:00:28 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 4adbc6d..e1b8270 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -58,17 +58,17 @@
         WHERE id in (${serid})
     </select>
 
-    <!--     and !find_in_set(#{serid}, serid)-->
     <select id="selectLi" resultMap="taskResultMap">
         SELECT A.*,IFNULL(B.num,0) as nums FROM (
         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
+            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">
             <if test="jurisdiction!='1372091709474910209'">
+                qd.jnum!=qd.num AND qd.rtype = "2"
+                and (!find_in_set(#{serid}, serid) OR serid IS NULL )
                 and (j.id =#{jurisdiction} or
                 j.parent_id = #{jurisdiction})
             </if>
@@ -77,14 +77,13 @@
             as num,hdid FROM sys_taskfk GROUP BY hdid) B ON A.id=B.hdid
         </if>
     </select>
-    <!--   !find_in_set(#{serid}
-                , serid)
-              AND -->
+
     <select id="selectNum" resultType="java.lang.Integer">
         SELECT COUNT(*) as num
         FROM sys_taskqd qd
                  LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction
-        WHERE jnum!=num
+        WHERE jnum!=num AND qd.rtype = "2" AND
+           (!find_in_set(#{serid}, serid) OR serid IS NULL )
           and (j.id =#{jurisdiction}
            or
             j.parent_id = #{jurisdiction})

--
Gitblit v1.9.3