From 6f21827607ff0a8d9254bea3554f454a56ff628d Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 14 Jul 2025 17:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/material/lease/LeaseTaskMapper.xml | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
index af374d6c..c8420f12 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
@@ -567,23 +567,25 @@
         bp.contract_part as contractPart,
         sd.dept_name as impUnitName
         from
-        lease_apply_info lai
-        left join tm_task tt on lai.task_id = tt.task_id
-        left join lease_apply_details lad on lai.id = lad.parent_id
-        left join tm_task_agreement tta on lai.task_id = tta.task_id
-        left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id
-        left join bm_unit bu on bu.unit_id = lai.unit_id
-        left join bm_project bp on bp.pro_id = lai.project_id
-        left join sys_dept sd on sd.dept_id = bp.imp_unit
-        left join sys_dict_data sda on tt.task_status = sda.dict_value
-        and sda.dict_type = 'lease_task_status'
-        left join ma_type mt on lad.type_id = mt.type_id and mt.del_flag = '0'
-        left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
-        left join sys_workflow_record swr on tt.task_id = swr.task_id
-        left join sys_workflow_type swt on swr.workflow_id = swt.id
-        left join sys_workflow_node swn on swt.id = swn.type_id
-        left join sys_workflow_config swc on swn.id = swc.node_id
-        left join sys_workflow_record_history  swrs on swr.id = swrs.record_id
+        sys_workflow_record swr
+        LEFT JOIN tm_task tt ON tt.task_id = swr.task_id
+        LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
+        LEFT JOIN lease_apply_details lad ON lai.id = lad.parent_id
+        LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
+        LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+        LEFT JOIN bm_unit bu ON bu.unit_id = lai.unit_id
+        LEFT JOIN bm_project bp ON bp.pro_id = lai.project_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
+        LEFT JOIN sys_dict_data sda ON tt.task_status = sda.dict_value
+        AND sda.dict_type = 'lease_task_status'
+        LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
+        AND mt.del_flag = '0'
+        LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+        AND mt1.del_flag = '0'
+        LEFT JOIN sys_workflow_type swt ON swr.workflow_id = swt.id
+        LEFT JOIN sys_workflow_node swn ON swt.id = swn.type_id
+        LEFT JOIN sys_workflow_config swc ON swn.id = swc.node_id
+        LEFT JOIN sys_workflow_record_history swrs ON swr.id = swrs.record_id
         where 1=1
 <!--        <if test="userId != null  and userId != ''">and swc.config_value  LIKE CONCAT('%', #{userId}, '%')</if>-->
         <if test="code != null  and code != ''">and lai.code = #{code}</if>