From 8058a6a7e5aed0d87a8f290272358fb99c2e4c67 Mon Sep 17 00:00:00 2001
From: 18500206848 <liyanspace@163.com>
Date: Sun, 28 Apr 2024 22:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.js    | 15 ++++++++++++++-
 src/views/system/user.vue | 12 ++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/api/system/role.js b/src/api/system/role.js
index 4dde8cd..87335c2 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/jobslink-api/system/role/list',
+    url: '/api/jobslink-api/system/role/roleList',
     method: 'get',
     params: {
       ...params,
@@ -11,6 +11,19 @@ export const getList = (current, size, params) => {
     }
   })
 }
+
+export const getRoleList = (current, size, params) => {
+  return request({
+    url: '/api/jobslink-api/system/role/roleList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
 export const grantTree = () => {
   return request({
     url: '/api/jobslink-api/system/menu/grant-tree',
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 123d086..a8a716c 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -217,6 +217,12 @@ export default {
         dialogType: "drawer",
         dialogClickModal: false,
         column: [
+          {
+            label: "所属部门",
+            prop: "deptName",
+            // slot: true,
+            display: false,
+          },
           {
             label: "登录账号",
             prop: "account",
@@ -236,12 +242,6 @@ export default {
             // slot: true,
             display: false,
           },
-          {
-            label: "所属部门",
-            prop: "deptName",
-            // slot: true,
-            display: false,
-          },
         ],
         group: [
           {