From 2d229eef4d2b3bf972e1b4e46d027acf0d080d3b Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期五, 03 十一月 2023 10:26:33 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml b/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml index afb1a3f..0a29984 100644 --- a/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml +++ b/hd/pipe/engineeringManage/src/main/resources/mapping/TBigDeviceMapper.xml @@ -333,12 +333,17 @@ tbd.is_need AS isNeed, tbd.device_source AS deviceSource, tbd.device_nexus AS deviceNexus, - tbd.fixed_person AS fixedPerson + spu.real_name AS realName, + spu.phone AS zrrPhone, + tbd.fixed_person AS fixedPerson, + su.real_name AS adminRealName, + tbd.admin_phone AS adminPhone FROM t_big_device tbd LEFT JOIN sys_dict sd ON tbd.big_type = sd.dict_id LEFT JOIN sys_plat_user spu ON tbd.user_id = spu.user_id LEFT JOIN sys_supplier ss ON tbd.supplier_id = ss.id + LEFT JOIN sys_users su ON su.user_id = tbd.create_user where tbd.is_use=1 <if test="bigDeviceName!=null and bigDeviceName!='' "> and tbd.big_device_Name like concat('%',#{bigDeviceName},'%') -- Gitblit v1.9.3