防治区企事业单位详情和行政区划数据查询修改,关联文件数据查询修改

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

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();