From 4f67ac7f80c241e9156a4438a2e9035262981129 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 7 Aug 2025 09:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/clz/MaterialLeaseInfoMapper.xml | 5 ++++- .../resources/mapper/material/clz/MaterialMachineMapper.xml | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index fbc0400e..fdd5665d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -875,7 +875,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_name as typeName, mm.ma_id as maId, mm.ma_code as maCode, - lod.create_by as outPerson, + su.nick_name as outPerson, lod.create_time as outTime FROM clz_lease_out_details lod @@ -884,6 +884,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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_user su on su.user_id=lod.create_by WHERE lod.parent_id = #{parentId} and mt.type_id = #{typeId} @@ -1194,5 +1195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE lod.parent_id = #{id} AND lod.type_id = #{typeId} + AND su.sign_type IS NOT NULL + AND su.sign_url IS NOT NULL \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 186d15fa..0a28d824 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -344,7 +344,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM bm_unit WHERE bzz_idcard = #{username} - LIMIT 1