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 @@ - order by ec.create_time desc - + order by CASE WHEN ci.type = 2 THEN 0 ELSE 1 END, + ci.corp_order ASC;