diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index e8eb950..9ce2b17 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml @@ -124,7 +124,12 @@ pp,sb_ip,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx ) e ON a.id = e.asset_id LEFT JOIN ( SELECT - asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp + asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp, + yjxh AS aqyjxh, + yjxlh AS aqyjxlh, + yjbbxx AS aqyjbbxx, + yjyt AS aqyjyt, + yjbsxx AS aqyjbswz FROM asset_basic_network WHERE type = 3 GROUP BY asset_id,sblx,pp,sb_ip ) l ON a.id = l.asset_id a.del_flag = '0' and a.isbf = '0'