隐患考评调整

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)) {

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">

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