From 62440aa59aeaf9a85876b8d3dcdab4fb402fb75f Mon Sep 17 00:00:00 2001
From: siyaqi <http://172.16.1.12:8700/>
Date: Fri, 6 Jun 2025 10:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue-fastapi-backend/module_admin/dao/datastd_dao.py      | 6 ++----
 vue-fastapi-frontend/src/views/datastd/stdcode/index.vue | 8 ++------
 vue-fastapi-frontend/src/views/datastd/stddict/index.vue | 7 +------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
index 42642bf..81a2a0b 100644
--- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py
+++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
@@ -337,10 +337,8 @@ class DataStdDao:
             DataStdMain.data_std_busi_ownership_prsn.label("data_std_busi_ownership_prsn")  
 
             )
-            .outerjoin(  # 使用left outer join确保即使没有关联code也能返回主表数据
-              DataStdDict,
-              DataStdMain.data_std_no == DataStdDict.data_std_no
-               )
+        .outerjoin(DataStdMain, DataStdDict.data_std_no == DataStdMain.data_std_no)  # 正确方向的左连接
+
             .where(*filters)
             .order_by(desc(DataStdDict.create_time))  # 按创建时间降序排序
         )
diff --git a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
index 60a07b9..f85c1c3 100644
--- a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
@@ -148,7 +148,7 @@
         </el-table>
 
         <!-- 分页 -->
-        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="handlePagination" />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
 
@@ -214,11 +214,7 @@ const defaultProps = {
 const dialogVisible2 = ref(false);
 const dialogTitle2 = ref('标准代码');
 const selectedRow = ref(null); // 传递给 codeItem 组件的数据
-const handlePagination = (pageNum, pageSize) => {
-  queryParams.value.pageNum = pageNum;
-  queryParams.value.pageSize = pageSize;
-  handleQuery();
-};
+
 const getSrcSysName = (id) => {
   const match = dbResourceOldList.value.find(item => item.id === id);
   return match ? match.name : id;
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
index 083b929..c5bfc03 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
@@ -212,7 +212,7 @@
           :total="total"
           v-model:page="queryParams.pageNum"
           v-model:limit="queryParams.pageSize"
-          @pagination="handlePagination"
+          @pagination="getList"
         />
       </el-col>
     </el-row>
@@ -296,11 +296,6 @@ const handleStdClick = (code) => {
   });
 
 };
-const handlePagination = (pageNum, pageSize) => {
-  queryParams.value.pageNum = pageNum;
-  queryParams.value.pageSize = pageSize;
-  handleQuery();
-};
 
 const transCodetoId = (dataStdNo) => {
   const match = stdList.value.find(item => item.dataStdNo === dataStdNo);