From 48d9ebf5312970358b97513bee4e533a6f26cc9b Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 23 Dec 2024 11:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=B4=A8=E6=A3=80=E8=AE=B0?= =?UTF-8?q?=E5=BD=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/device/DevInfoMapper.xml | 1 + .../main/resources/mapper/material/device/MaDevQcMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 98f38f7..f24c6d2 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -239,6 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, + d.own_id as ownId, d.own_co as companyId, sd.dept_name as companyName, c.operate_address as operateAddress, diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 5581b4a..88ec279 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -102,12 +102,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bfi.url AS url FROM ma_dev_qc mdq - LEFT JOIN bm_file_info bfi ON bfi.model_id = mdq.ma_id + LEFT JOIN bm_file_info bfi ON bfi.model_id = mdq.ma_id and bfi.task_id = mdq.id LEFT JOIN sys_user su ON mdq.create_by = su.user_id WHERE bfi.task_type = 17 AND bfi.file_type = 4 - AND bfi.task_id = #{id} + AND bfi.model_id = #{maId} and mdq.qc_code like concat('%',#{qcCode},'%')