From 22977038e228d7bcb5ca95f2178db3a2fb60a086 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 9 Jan 2026 21:33:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E9=BA=BB=E7=B2=BE=E8=8D=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86]=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/MjyFfjlMapper.xml         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml
index 8b031e9..1cb6f8e 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyFfjlMapper.xml
@@ -5,11 +5,11 @@
 <mapper namespace="com.hxhq.business.mapper.MjyFfjlMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.FfjlListDto">
         select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw
-        ,t.syl,t.syldw,t.jlzt,t.jyzt,s.name as mdMc
-        ,z.mc as zcgMc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other
+        ,z.mc as zcgMc,
+        (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy_ffjl` t
         join  `t_zcg` z on z.id=t.zcg_id
-        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -18,7 +18,8 @@
     </select>
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.mjy.FfjlDetailDto">
-        select t.*
+        select t.*,
+        (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy_ffjl` t
         where t.id=#{id}
     </select>