From 5640e7cde7d0210ff4ac5fae60d7bc521e49b487 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 23 Aug 2024 14:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E5=8F=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A2=86=E6=96=99=E7=9A=84=E6=9C=BA=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/BackApplyMapper.xml       | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 840872b..9b5deab 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -692,20 +692,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getUseTypeTreeL4" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
         SELECT
-            mt.type_id,
-            mt.type_name,
-            mt.parent_id,
-            mt.unit_name as unitNames,
-            mt.company_id,
-            SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
-            mt.LEVEL
+            t4.type_id,
+            t4.type_name,
+            t4.parent_id,
+            t4.unit_name,
+            t4.company_id,
+            COALESCE(SUM(CASE WHEN sai.agreement_id = #{agreementId} AND sai.status = '0' THEN sai.num ELSE 0 END), 0) AS num,
+            4 AS LEVEL
         FROM
-            ma_type mt
-                LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
+            ma_type t4
+                LEFT JOIN slt_agreement_info sai ON t4.type_id = sai.type_id
         WHERE
-            EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} AND sai2.STATUS = '0' and sai.lease_type = 0)
+            t4.level = 4
+          AND EXISTS (
+            SELECT 1 FROM slt_agreement_info sai2
+            WHERE sai2.type_id = t4.type_id AND sai2.agreement_id = #{agreementId} AND sai2.status = '0'
+        )
         GROUP BY
-            mt.type_id
+            t4.type_id
     </select>
 
     <select id="getUseTypeTreeL3" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">