From 709fb49bbb347c7910cbd73aa672f82870bae719 Mon Sep 17 00:00:00 2001
From: lishiwei <3230787218@qq.com>
Date: Thu, 11 Jun 2026 08:38:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor():=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AF=84=E4=BC=B0=E7=BB=9F=E8=AE=A1=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HiddenEvaluationRecordMapper.java  |  3 +-
 .../HiddenEvaluationRecordRepositoryImpl.java |  7 ++-
 .../mapper/HiddenEvaluationRecordMapper.xml   | 58 +++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java
index 2167b24..e45b342 100644
--- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java
@@ -19,7 +19,6 @@ import java.util.Map;
 @DataScopes({
         @DataScope(method = "corpHidddenPage", menuPerms = ""),
         @DataScope(method = "corpEvalStatisticsPage", menuPerms = ""),
-        @DataScope(method = "userEvalStatisticsPage", menuPerms = ""),
         @DataScope(method = "corpEvalPage", menuPerms = ""),
 })
 public interface HiddenEvaluationRecordMapper extends BaseMapper<HiddenEvaluationRecordDO> {
@@ -32,6 +31,8 @@ public interface HiddenEvaluationRecordMapper extends BaseMapper<HiddenEvaluatio
 
     IPage<UserEvalStatisticsDO> userEvalStatisticsPage(IPage<UserEvalStatisticsDO> iPage, Map<String, Object> params, String menuPerms);
 
+    Long userEvalStatisticsPageCount(Map<String, Object> params, String menuPerms);
+
     IPage<HiddenEvalDO> hiddenEvalPage(IPage<HiddenEvalDO> iPage, Map<String, Object> params);
 
     IPage<CorpEvalDO> corpEvalPage(IPage<CorpEvalDO> iPage, Map<String, Object> params, String menuPerms);
diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java
index a37e125..d75b0b1 100644
--- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java
@@ -80,13 +80,14 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl<Hid
     @Override
     public PageResponse<UserEvalStatisticsDO> userEvalStatisticsPage(Map<String, Object> params) {
         IPage<UserEvalStatisticsDO> iPage = new Query<UserEvalStatisticsDO>().getPage(params);
+        ((com.baomidou.mybatisplus.extension.plugins.pagination.Page<?>) iPage).setSearchCount(false);
         String menuPerms = "";
         if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
             menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
         }
-        // 关闭 count SQL 优化，因为该查询包含派生表子查询 + CROSS JOIN 等复杂结构，JSQLParser 无法解析
-        ((com.baomidou.mybatisplus.extension.plugins.pagination.Page<?>) iPage).setOptimizeCountSql(false);
-        IPage<UserEvalStatisticsDO> result = hiddenEvaluationRecordMapper.userEvalStatisticsPage(iPage, params,menuPerms);
+        IPage<UserEvalStatisticsDO> result = hiddenEvaluationRecordMapper.userEvalStatisticsPage(iPage, params, menuPerms);
+        Long total = hiddenEvaluationRecordMapper.userEvalStatisticsPageCount(params, menuPerms);
+        result.setTotal(total != null ? total : 0);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
index 381945f..03b36e2 100644
--- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
@@ -437,6 +437,64 @@
         ORDER BY userId ASC
     </select>
 
+    <select id="userEvalStatisticsPageCount" resultType="java.lang.Long">
+        SELECT COUNT(*) FROM (
+            SELECT u.id
+            FROM user u
+            LEFT JOIN hidden h ON h.creator_id = u.id
+                AND h.delete_enum = 'FALSE'
+                AND h.state = 301
+                AND ((h.source IN (4,5) AND h.final_check = 1) OR h.source NOT IN (4,5))
+                AND h.hidden_type IN ('aqyh','rdbaqys','wzcz','wzzh','grfhyp','wdbaqzt','jxsb','hcl','dqsb','gsj','aqbhzz','ss','xf','tzsb','hjdbaqys','zmjdgyxbj','aqbzbs','gkkd','zykjxzzl','eltq','gldqx','wzdhzdlsbdw','wfacs','jypx','aqyh-qt')
+            WHERE u.delete_enum = 'FALSE'
+                AND h.id IS NOT NULL
+            <if test="params.corpinfoId != null">
+                AND u.corpinfo_id = #{params.corpinfoId}
+            </if>
+            <if test="params.departmentId != null ">
+                AND u.department_id = #{params.departmentId}
+            </if>
+            <if test="params.userName != null and params.userName != ''">
+                AND u.name LIKE CONCAT('%', #{params.userName}, '%')
+            </if>
+            <if test="params.userIdList != null and params.userIdList.size() > 0">
+                AND u.id IN
+                <foreach collection="params.userIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            GROUP BY u.id
+
+            UNION ALL
+
+            SELECT u.id
+            FROM user u
+            LEFT JOIN hidden h ON h.creator_id = u.id
+                AND h.delete_enum = 'FALSE'
+                AND h.state = 301
+                AND ((h.source IN (4,5) AND h.final_check = 1) OR h.source NOT IN (4,5))
+                AND h.hidden_type IN ('wshb','hjwr','ws','dq','zs','gf','hjwsjlh','yqfk','wshb-qt')
+            WHERE u.delete_enum = 'FALSE'
+                AND h.id IS NOT NULL
+            <if test="params.corpinfoId != null">
+                AND u.corpinfo_id = #{params.corpinfoId}
+            </if>
+            <if test="params.departmentId != null ">
+                AND u.department_id = #{params.departmentId}
+            </if>
+            <if test="params.userName != null and params.userName != ''">
+                AND u.name LIKE CONCAT('%', #{params.userName}, '%')
+            </if>
+            <if test="params.userIdList != null and params.userIdList.size() > 0">
+                AND u.id IN
+                <foreach collection="params.userIdList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            GROUP BY u.id
+        ) total_count
+    </select>
+
     <select id="hiddenEvalPage" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.HiddenEvalDO">
         select h.source,
         h.hidden_id                                                             AS hiddenId,