From 27f9b9cbb3efacde8d3ace82f933aaa3a4280892 Mon Sep 17 00:00:00 2001
From: zhangyue <zhangyue>
Date: Fri, 10 Apr 2026 10:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9F=B9=E8=AE=AD=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edu/dto/training/TrainingUserPageProjectQry.java  |  2 +-
 .../src/main/resources/mapper/study/StudentMapper.xml | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java
index 2b36bb2..15a9c6d 100644
--- a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java
+++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java
@@ -29,7 +29,7 @@ public class TrainingUserPageProjectQry extends PageQuery {
     private Integer flowFlag;
     private Integer noMain;
     private Integer eqEmploymentFlag;
-    private List<Integer> departmentList;
+    private List<Long> departmentList;
     private String name;
     private Integer corpinfoId;
 
diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
index 5cb88b0..4ccabcf 100644
--- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
@@ -423,8 +423,8 @@
 
     <select id="educationUserList" resultType="com.zcloud.edu.dto.clientobject.study.EducationUserCO">
         SELECT
-            GROUP_CONCAT(DISTINCT p.corpinfo_id SEPARATOR ', ') AS corpinfo_id,
-            GROUP_CONCAT(DISTINCT p.corpinfo_name SEPARATOR ', ') AS corpinfo_name,
+            GROUP_CONCAT(DISTINCT c.id SEPARATOR ', ') AS corpinfo_id,
+            GROUP_CONCAT(DISTINCT c.corp_name SEPARATOR ', ') AS corpinfo_name,
             GROUP_CONCAT(DISTINCT p.project_id SEPARATOR ', ') AS project_id,
             GROUP_CONCAT(DISTINCT p.project_name SEPARATOR ', ') AS project_name,
             u.name,
@@ -444,15 +444,16 @@
                 WHERE delete_enum = 'FALSE' AND apply_type IN (2, 3)
                 ) tap ON tap.training_apply_record_id = tau.training_apply_record_id AND tap.rn = 1
             left join user u on tau.user_id = u.id
-            left join project_user f  on u.id = f.user_id
+            left join corp_info c on c.id = u.corpinfo_id
+            left join project_user f  on u.id = f.user_id and f.delete_enum = 'FALSE'
             left join project p on p.id = f.project_id and p.project_status = 4
             left join department d on d.id = u.department_id
             left join post po on u.post_id  = po.id
             left join training_user tu on tu.phone = u.phone
             LEFT JOIN project_approval_flow paf on paf.project_id = p.id and paf.delete_enum = 'FALSE' and paf.audit_type = 2 and paf.approval_status = 2
                 and paf.corpinfo_id = #{params.eqProjectCorpInfoId}
-        where f.delete_enum = 'FALSE'
-            and tap.corpinfo_id = #{params.eqProjectCorpInfoId}
+        where
+             tap.corpinfo_id = #{params.eqProjectCorpInfoId}
             and tau.delete_enum = 'FALSE'
             and tar.delete_enum = 'FALSE'
             and tau.apply_status = 2