From f02efaa94aaf8a5a9571ee2de4a7e1c98a832980 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 27 Dec 2024 14:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9web=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AssetCurrentMapper.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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'