From e1752d33c5ccdb2d31b66a059c253b83e710ec75 Mon Sep 17 00:00:00 2001
From: wang <wzh@>
Date: Thu, 11 Jun 2026 09:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E6=84=8F=E4=B8=89=E7=BA=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa/admin/module/business/jwpy/service/SurveyService.java    | 2 +-
 smart-flow-web/src/router/index.js                              | 2 +-
 smart-flow-web/src/store/modules/system/user.js                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/jwpy/service/SurveyService.java b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/jwpy/service/SurveyService.java
index 86feaf5..85bb0cf 100644
--- a/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/jwpy/service/SurveyService.java
+++ b/smart-flow-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/jwpy/service/SurveyService.java
@@ -65,7 +65,7 @@ public class SurveyService {
         wrapper.orderByDesc(SurveyEntity::getCreateTime);
 
         surveyDao.selectPage(page, wrapper);
-        PageResult<SurveyVO> pageResult = SmartPageUtil.convert2PageResult(page, SurveyVO.class);
+        PageResult<SurveyVO> pageResult = SmartPageUtil.convert2PageResult(page, page.getRecords(), SurveyVO.class);
         return ResponseDTO.ok(pageResult);
     }
 
diff --git a/smart-flow-web/src/router/index.js b/smart-flow-web/src/router/index.js
index d56917b..4081a21 100644
--- a/smart-flow-web/src/router/index.js
+++ b/smart-flow-web/src/router/index.js
@@ -118,7 +118,7 @@ export function buildRoutes(menuRouterList) {
       continue;
     }
     let routePath = e.path.startsWith('/') ? e.path : `/${e.path}`;
-    if (e.component && e.component.includes('jwpy/flow/index')) {
+    if (e.component && (e.component.includes('jwpy/flow/index') || e.component.includes('jwpy/jwpy/flow/index') || e.component.includes('/flow/index'))) {
       routePath = `${routePath}/:tabType?`;
     }
     let route = {
diff --git a/smart-flow-web/src/store/modules/system/user.js b/smart-flow-web/src/store/modules/system/user.js
index fd577cd..e87e9f4 100644
--- a/smart-flow-web/src/store/modules/system/user.js
+++ b/smart-flow-web/src/store/modules/system/user.js
@@ -375,7 +375,7 @@ function injectWorkflowSubMenus(menuNode) {
   }
 
   // 检测组件路径是否为警务评议与问题处置的通用工单列表
-  if (menuNode.component && menuNode.component.includes('jwpy/flow/index')) {
+  if (menuNode.component && (menuNode.component.includes('jwpy/flow/index') || menuNode.component.includes('jwpy/jwpy/flow/index') || menuNode.component.includes('/flow/index'))) {
     const dictStore = useDictStore();
     // 从数据字典加载流转状态项列表，实现真正的动态插拔
     const statesDict = dictStore.getDictData('WORKFLOW_STATE') || [];