From 4bee6949d6774df5886ececd15029fa14a3ad5e9 Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Thu, 22 Jan 2026 16:30:38 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2=E7=BC=93=E6=85=A2?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../material/lease/LeaseApplyInfoMapper.xml | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
index 1bc2b87f..6808b4c3 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
@@ -55,12 +55,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sda.dict_label as taskStatusName,
IFNULL(sum(lad.pre_num),0) as preCountNum,
IFNULL(sum(lod.num),0) as alNum,
- GROUP_CONCAT(DISTINCT mt1.type_name) as maTypeNames,
+-- GROUP_CONCAT(DISTINCT mt1.type_name) as maTypeNames,
+ null as maTypeNames,
bp.contract_part as contractPart,
sd.dept_name as impUnitName,
tt.task_type as taskType,
COALESCE(lai.release_time, lai.create_time) as releaseTime,
- GROUP_CONCAT(DISTINCT mt3.type_id) as firstId,
+-- GROUP_CONCAT(DISTINCT mt3.type_id) as firstId,
+ null as firstId,
su.sign_type as lease_sign_type,
su.sign_url as lease_sign_url,
lod.lease_sign_id as signId,
@@ -80,9 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sda.dict_type = 'lease_task_status'
left join sys_user su on lai.publisher = su.user_id
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 ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
- left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
+-- left join ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
+-- left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
+-- left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
JOIN ma_type_keeper mtk ON mtk.type_id = lad.type_id AND mtk.user_id = #{userId}
@@ -342,7 +344,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bai.agreement_code AS agreementCode,
IFNULL( sum( lpd.num ), 0 ) AS preCountNum,
IFNULL(lod.num, 0) AS alNum,
- GROUP_CONCAT( DISTINCT mt1.type_name ) AS maTypeNames,
+-- GROUP_CONCAT( DISTINCT mt1.type_name ) AS maTypeNames,
+ null AS maTypeNames,
lpd.publish_task AS publishTask,
lai.task_id AS taskId,
su.sign_url AS leaseSignUrl,
@@ -352,7 +355,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lai.confirm_time AS confirmTime,
lai.is_confirm AS isConfirm,
lai.confirm_remark AS confirmRemark,
- mt3.type_id AS firstId,
+-- mt3.type_id AS firstId,
+ null AS firstId,
lpd.create_time AS releaseTime,
lpd.parent_id AS parentId,
lpd.lease_sign_url AS signUrl,
@@ -372,9 +376,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_project bp ON bp.pro_id = lpd.project_id
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
LEFT JOIN ma_type mt ON lpd.new_type = 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 ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
- left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
+-- LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'
+-- left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = '0'
+-- left join ma_type mt3 ON mt2.parent_id = mt3.type_id and mt3.del_flag = '0'
LEFT JOIN bm_agreement_info bai ON lpd.unit_id = bai.unit_id AND lpd.project_id = bai.project_id AND bai.project_unit_id IS NULL
left join sys_user su on lpd.create_by = su.user_id