From 817f3f2d9c80b4057e4886e6be8616af96ad5ea8 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 13 Apr 2026 11:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/query/HiddenEvaluationRecordQueryExe.java         | 2 +-
 .../src/main/resources/mapper/EvaluationConfigMapper.xml      | 4 ++--
 .../main/resources/mapper/HiddenEvaluationRecordMapper.xml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java
index 0e087f2..02887d9 100644
--- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java
@@ -75,7 +75,7 @@ public class HiddenEvaluationRecordQueryExe {
         if(corpInfoRepository.checkCorp()){
             checkKey = AuthContext.getTenantId().toString();
         }else{*/
-         String  checkKey = AuthContext.getTenantId() + "-" + AuthContext.getUserId();
+         String  checkKey = AuthContext.getUserId().toString();
 
         examCenterCOS.forEach(co -> {
             if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) {
diff --git a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml
index 0634e56..59462ad 100644
--- a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml
@@ -55,8 +55,8 @@
                 <!-- 不做额外过滤 -->
             </otherwise>
         </choose>
-        order by ec.create_time desc
-
+        order by  CASE WHEN ci.type = 2 THEN 0 ELSE 1 END,
+        ci.corp_order ASC;
     </select>
 
     <select id="listAll" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.EvaluationConfigDO">
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
index f6b698a..1c82cf2 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
@@ -112,7 +112,7 @@
                  ), ''
                 ) AS noEvaluationMembers,
                 COALESCE(
-                (SELECT GROUP_CONCAT(DISTINCT CONCAT(usr.corpinfo_id, '-', usr.id))
+              (SELECT GROUP_CONCAT(DISTINCT CONCAT(usr.id))
                 FROM evaluation_config ec
                 LEFT JOIN user usr ON ec.user_id = usr.id
                 WHERE ec.corpinfo_id = h.corp_id