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 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 List 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 @@
+

读取 {{ fieldValueQueryResult.total }} 条记录,共 {{ fieldValueQueryResult.rows.length }} 组不同值

{ gh: `MOCK${suffix}`, bmmz: departmentCode, bm: departmentName, + zc: ['教授', '副教授', '讲师', '助教'][index % 4], zcszbm: departmentName, zcszbmmz: departmentCode, nl: String(2026 - birthYear),