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},'%')