From fc621495bc5a887b2654cc18d0ab7511f9a8d36a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 五月 2025 17:45:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/system/user.js | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 577bea2..3a45768 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,5 +1,5 @@
import request from '@/utils/request'
-import { praseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/ruoyi";
// 鏌ヨ鐢ㄦ埛鍒楄〃
export function listUser(query) {
@@ -13,7 +13,7 @@
// 鏌ヨ鐢ㄦ埛璇︾粏
export function getUser(userId) {
return request({
- url: '/system/user/' + praseStrEmpty(userId),
+ url: '/system/user/' + parseStrEmpty(userId),
method: 'get'
})
}
@@ -96,7 +96,7 @@
return request({
url: '/system/user/profile/updatePwd',
method: 'put',
- params: data
+ data: data
})
}
@@ -105,6 +105,7 @@
return request({
url: '/system/user/profile/avatar',
method: 'post',
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
data: data
})
}
@@ -125,3 +126,18 @@
params: data
})
}
+
+// 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋�
+export function deptTreeSelect() {
+ return request({
+ url: '/system/user/deptTree',
+ method: 'get'
+ })
+}
+// 鏌ヨ鐢ㄦ埛鍒楄〃
+export function userListNoPage() {
+ return request({
+ url: '/system/user/userListNoPage',
+ method: 'get'
+ })
+}
--
Gitblit v1.9.3