From 6fcbd94f112d57f2f76f6066f024f8eeae16eaa8 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 19 Jan 2026 15:54:24 +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/lease/LeaseApplyDetailsMapper.xml | 4 ++-- .../src/main/resources/mapper/material/ma/TypeMapper.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index bc8a5e29..d8198635 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -874,8 +874,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt1.type_name as typeModelName, mt.type_name as typeName, mt.unit_name as unitName, - lai.code as code, - lpd.code as businessCode, + lai.code as businessCode, + lpd.code as code, lpd.lease_person AS leasePerson, tt.task_status as taskStatus, tt.create_time AS releaseTime, diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml index 4654daab..88c4c7a1 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml @@ -1526,9 +1526,9 @@ AND CASE - WHEN (#{companyId} = 102 or #{companyId} = 327) THEN mt.company_id= 101 - WHEN #{companyId} = 309 THEN (mt.company_id=#{companyId}) or (mt.company_id=101 and mt.jiju_type=1) - ELSE mt.type_id=-1 + WHEN (#{companyId} = 102 or #{companyId} = 327) THEN m.company_id= 101 + WHEN #{companyId} = 309 THEN (m.company_id=#{companyId}) or (m.company_id=101 and m.jiju_type=1) + ELSE m.type_id=-1 END