From 93da634afc42d00ebada2938fa0db584c948d17b Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 14 Aug 2024 13:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=B2=BB=E5=8C=BA=E4=BC=81=E4=BA=8B?=
 =?UTF-8?q?=E4=B8=9A=E5=8D=95=E4=BD=8D=E8=AF=A6=E6=83=85=E5=92=8C=E8=A1=8C?=
 =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9,=E5=85=B3=E8=81=94=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/mapper/FileAssociationsMapper.java     |  3 ++-
 .../gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java  | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
index a3e37e1..bef3e3b 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/FileAssociationsMapper.java
@@ -27,7 +27,8 @@ public interface FileAssociationsMapper extends BaseMapper<FileAssociations> {
             	file_associations fa
             	LEFT JOIN file_descriptor fd ON fa.file_id = fd.file_id
             WHERE
-            	fa.business_id = #{businessId}
+                fa.del = 0
+                AND fa.business_id = #{businessId}
             	AND fa."table_name" = #{tableName}
             	AND fd.group_id = #{tableName}
             ORDER BY fa.tm desc
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
index b19892f..c5c918b 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
@@ -18,8 +18,14 @@ public interface IaCBsnssinfoMapper extends BaseMapper<IaCBsnssinfo> {
 
     @Select("""
             <script>
-            SELECT st.*,r.adnm FROM ia_c_bsnssinfo st
-            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            SELECT
+                st.*,
+                r1.adnm||r.adnm adnm
+            FROM
+                ia_c_bsnssinfo st
+           	LEFT JOIN st_addvcd_d
+                r ON st.adcd = r.adcd
+           	LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
             </script>
             """)
     List<HomeIaCBsnssinfoVo> getDetailsAndMonitoringDataLis();