From 9beef68e6200d2750a7607e58733d06775a4d471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com>
Date: Thu, 12 Nov 2026 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=BF=81=E7=A7=BB=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PersonApiConfigServiceImpl.java    | 13 ++++++-------
 .../platform/personGovernance/apiConfig/form.html   |  2 ++
 tools/person-governance-api-mock.js                 |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/personGovernance/apiConfig/service/impl/PersonApiConfigServiceImpl.java b/src/main/java/com/budwk/app/zhgh/personGovernance/apiConfig/service/impl/PersonApiConfigServiceImpl.java
index c3e8fdf..aadf3ad 100644
--- a/src/main/java/com/budwk/app/zhgh/personGovernance/apiConfig/service/impl/PersonApiConfigServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/personGovernance/apiConfig/service/impl/PersonApiConfigServiceImpl.java
@@ -581,12 +581,7 @@ public class PersonApiConfigServiceImpl extends BaseServiceImpl<PersonApiConfig>
                 groups.add(values);
             }
             total += records.size();
-            if (singleRequest || (expectedTotal != null && total >= expectedTotal)) break;
-            if (records.size() < pageSize) {
-                Assert.isTrue(expectedTotal == null,
-                        "接口未返回全部数据，预计 " + expectedTotal + " 条，实际返回 " + total + " 条");
-                break;
-            }
+            if (singleRequest || (expectedTotal != null && total >= expectedTotal) || records.size() < pageSize) break;
             cursor = Math.addExact(cursor, step);
             if (legacyPaging) setFieldQueryPage(config, params, cursor, pageSize);
         }
@@ -594,7 +589,11 @@ public class PersonApiConfigServiceImpl extends BaseServiceImpl<PersonApiConfig>
             List<String> missing = names.stream().filter(name -> !found.contains(name)).toList();
             Assert.isTrue(missing.isEmpty(), "返回数据中找不到字段：" + String.join("、", missing));
         }
-        return NutMap.NEW().addv("fields", names).addv("rows", new ArrayList<>(groups)).addv("total", total);
+        NutMap result = NutMap.NEW().addv("fields", names).addv("rows", new ArrayList<>(groups)).addv("total", total);
+        if (expectedTotal != null && total < expectedTotal) {
+            result.addv("warning", "接口未返回全部数据，预计 " + expectedTotal + " 条，实际返回 " + total + " 条");
+        }
+        return result;
     }
 
     private List<?> fieldQueryRecords(Object response, String listPath, Integer returnedTotal) {
diff --git a/src/main/resources/views/platform/personGovernance/apiConfig/form.html b/src/main/resources/views/platform/personGovernance/apiConfig/form.html
index 3a259a7..222c987 100644
--- a/src/main/resources/views/platform/personGovernance/apiConfig/form.html
+++ b/src/main/resources/views/platform/personGovernance/apiConfig/form.html
@@ -445,6 +445,8 @@
         <el-input v-model="fieldValueQueryInput" :disabled="fieldValueQueryLoading" clearable
             placeholder="输入返回字段名，多个字段用逗号分隔，例如 xb,mz" @keyup.enter.native="queryFieldValues"></el-input>
         <div v-if="fieldValueQueryResult" style="margin-top: 16px">
+            <el-alert v-if="fieldValueQueryResult.warning" :title="fieldValueQueryResult.warning"
+                type="warning" :closable="false" show-icon></el-alert>
             <p>读取 {{ fieldValueQueryResult.total }} 条记录，共 {{ fieldValueQueryResult.rows.length }} 组不同值</p>
             <el-table :data="fieldValueQueryResult.rows" border max-height="420" empty-text="接口没有返回数据">
                 <el-table-column v-for="(field, index) in fieldValueQueryResult.fields" :key="field" :label="field"
diff --git a/tools/person-governance-api-mock.js b/tools/person-governance-api-mock.js
index a0c8871..69329c1 100644
--- a/tools/person-governance-api-mock.js
+++ b/tools/person-governance-api-mock.js
@@ -58,6 +58,7 @@ const persons = Array.from({ length: 240 }, (_, index) => {
         gh: `MOCK${suffix}`,
         bmmz: departmentCode,
         bm: departmentName,
+        zc: ['教授', '副教授', '讲师', '助教'][index % 4],
         zcszbm: departmentName,
         zcszbmmz: departmentCode,
         nl: String(2026 - birthYear),