From 83aa1f7ee85a0d035d48d5ba647954d417a9b6ff Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 30 八月 2023 18:26:53 +0800
Subject: [PATCH] 文件服务修改

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml |    2 +-
 Source/UBCS-WEB/src/api/resource/oss.js                                     |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/resource/oss.js b/Source/UBCS-WEB/src/api/resource/oss.js
index c8733fd..ebbced3 100644
--- a/Source/UBCS-WEB/src/api/resource/oss.js
+++ b/Source/UBCS-WEB/src/api/resource/oss.js
@@ -12,6 +12,18 @@
   })
 }
 
+export const getPage = (current, size, params) => {
+  return request({
+    url: '/api/ubcs-resource/oss/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/ubcs-resource/oss/detail',
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
index 020ff7e..bd0e411 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
@@ -74,7 +74,7 @@
             LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
             LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
         WHERE
-            tenant_id = #{param1} and account = #{param2}
+            pou.tenant_id = #{param1} and account = #{param2}
             <if test="param3!=null and param3 != ''">
                 and name = #{param3}
             </if>

--
Gitblit v1.9.3