调整统计过滤

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -119,18 +119,19 @@
             ) m
             ON m.project_id = tpw.project_id AND m.max_workflow_id = tpw.workflow_id
             <where>
+                EXISTS (
+                SELECT 1 FROM t_project p
+                WHERE p.id = tpw.project_id
                 <if test="projectType != null">
-                    EXISTS (
-                        SELECT 1 FROM t_project p
-                        WHERE p.id = tpw.project_id AND p.project_type = #{projectType} AND p.on_chain_num > 0
-                    )
+                    AND p.project_type = #{projectType}
                 </if>
+                AND p.on_chain_num > 0
+                )
             </where>
         ) t
         GROUP BY t.workflow_name
     </select>
 
-
     <select id="selectProjectOneNodeId" parameterType="map" resultMap="ProjectWorkflowResultMap">
         SELECT
             flow2.id,

siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml

@@ -102,12 +102,20 @@
             ) AS gdArea
         FROM t_tdgy td
         <where>
-            <if test="projectType != null">
+        <choose>
+            <when test="projectType == null">
                 EXISTS (
-                    SELECT 1 FROM t_project p
-                    WHERE p.id = td.project_id AND p.project_type = #{projectType} and p.on_chain_num > 0
+                SELECT 1 FROM t_project p
+                WHERE p.id = td.project_id  and p.on_chain_num > 0
                 )
-            </if>
+            </when>
+            <when test="projectType != null">
+                EXISTS (
+                SELECT 1 FROM t_project p
+                WHERE p.id = td.project_id AND p.project_type = #{projectType} and p.on_chain_num > 0
+                )
+            </when>
+        </choose>
         </where>
         GROUP BY COALESCE(NULLIF(TRIM(td.gd_type), ''), '其他')
     </select>