From d001a0de1524e4a9171184592ef8bbe4e6a04678 Mon Sep 17 00:00:00 2001
From: chenchun <454313500@qq.com>
Date: Sun, 11 Sep 2022 02:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/SwaggerDoc.xml                     |  68 +-
 .../Controllers/AccountController.cs          |   4 +-
 .../BaseSimpleCrudController.cs               |   5 +-
 .../Controllers/RoleController.cs             |   2 +-
 .../Controllers/UserController.cs             |   9 +-
 .../yi-sqlsugar-dev.db                        | Bin 126976 -> 126976 bytes
 .../Yi.Framework.Interface/IUserService.cs    |  17 +-
 .../Yi.Framework.Model.csproj                 |   2 +-
 .../Yi.Framework.Service/UserService.cs       |  24 +-
 Yi.Vue3.X.RuoYi/src/api/system/role.js        |   7 +
 Yi.Vue3.X.RuoYi/src/api/system/user.js        |   2 +-
 .../src/views/system/user/index.vue           | 912 ++++++++----------
 12 files changed, 445 insertions(+), 607 deletions(-)

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 60658e32..371d9ddd 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -115,7 +115,7 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.BaseSimpleCrudController`1.GetList(Yi.Framework.Model.Query.QueryCondition)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.BaseSimpleCrudController`1.GetList">
             <summary>
             全部列表查询
             </summary>
@@ -150,40 +150,6 @@
             <param name="page"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.Add(Yi.Framework.Model.Models.DictionaryEntity)">
-            <summary>
-            添加字典表
-            </summary>
-            <param name="dic"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.GetById(System.Int64)">
-            <summary>
-            根据字典id获取字典表
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.GetList">
-            <summary>
-            获取全部字典表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.DelList(System.Collections.Generic.List{System.Int64})">
-            <summary>
-            id范围删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryController.Update(Yi.Framework.Model.Models.DictionaryEntity)">
-            <summary>
-            更新
-            </summary>
-            <param name="dic"></param>
-            <returns></returns>
-        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.PageList(Yi.Framework.Model.Models.DictionaryInfoEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询
@@ -192,13 +158,6 @@
             <param name="page"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.Add(Yi.Framework.Model.Models.DictionaryInfoEntity)">
-            <summary>
-            添加字典信息表
-            </summary>
-            <param name="dicInfo"></param>
-            <returns></returns>
-        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.GetListByType(System.String)">
             <summary>
             根据字典类别获取字典信息
@@ -206,27 +165,6 @@
             <param name="type"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.DelList(System.Collections.Generic.List{System.Int64})">
-            <summary>
-            id范围删除
-            </summary>
-            <param name="ids"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.Update(Yi.Framework.Model.Models.DictionaryInfoEntity)">
-            <summary>
-            更新
-            </summary>
-            <param name="dicInfo"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.DictionaryInfoController.GetById(System.Int64)">
-            <summary>
-            根据字典id获取字典信息表
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.FileController">
             <summary>
             文件
@@ -416,9 +354,9 @@
             <param name="giveUserSetRoleDto"></param>
             <returns></returns>
         </member>
-        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetRoleListByUserId(System.Int64)">
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetById(System.Int64)">
             <summary>
-            通过用户id得到角色列表
+            通过用户id得到用户信息关联部门、岗位、角色
             </summary>
             <returns></returns>
         </member>
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
index e6eacd32..5a3a3591 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
@@ -92,7 +92,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [Authorize]
+        //[Authorize]
         public async Task<Result> GetUserAllInfo()
         {
             //通过鉴权jwt获取到用户的id
@@ -111,7 +111,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         {
             var userId = HttpContext.GetCurrentUserEntityInfo(out _).Id;
             var data = await _iUserService.GetUserAllInfo(userId);
-           
+            
             //将后端菜单转换成前端路由，组件级别需要过滤
             List<VueRouterModel> routers = _iUserService.RouterBuild(data.Menus.ToList());
             return Result.Success().SetData(routers);
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs
index a4acd206..2feb5aaf 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseSimpleCrudController.cs
@@ -34,8 +34,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <param name="id"></param>
         /// <returns></returns>
         [Permission($"{nameof(T)}:get")]
+        [Route("{id}")]
         [HttpGet]
-        public virtual async Task<Result> GetById(long id)
+        public virtual async Task<Result> GetById([FromRoute]long id)
         {
             return Result.Success().SetData(await _repository.GetByIdAsync(id));
         }
@@ -45,7 +46,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [Permission($"{nameof(T)}:get")]
-        [HttpPost]
+        [HttpGet]
         public virtual async Task<Result> GetList()
         {
             return Result.Success().SetData(await _repository.GetListAsync());
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
index 57b2bc89..b4b38a18 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs
@@ -21,7 +21,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class RoleController : BaseCrudController<RoleEntity>
+    public class RoleController : BaseSimpleCrudController<RoleEntity>
     {
         private IRoleService _iRoleService;
         public RoleController(ILogger<RoleEntity> logger, IRoleService iRoleService) : base(logger, iRoleService)
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index 436ccf56..302fc6d9 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -21,7 +21,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class UserController : BaseCrudController<UserEntity>
+    public class UserController : BaseSimpleCrudController<UserEntity>
     {
         private IUserService _iUserService;
         public UserController(ILogger<UserEntity> logger, IUserService iUserService) : base(logger, iUserService)
@@ -85,13 +85,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
 
 
         /// <summary>
-        /// 通过用户id得到角色列表
+        /// 通过用户id得到用户信息关联部门、岗位、角色
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Result> GetRoleListByUserId(long userId)
+        [Route("{id}")]
+        public override async Task<Result> GetById(long id)
         {
-            return Result.Success().SetData(await _iUserService.GetRoleListByUserId(userId));
+            return Result.Success().SetData(await _iUserService.GetInfoById(id));
         }
     }
 }
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
index bc2597acdd9b90ed09ea2b331fc1aeb42169b108..6cc32675ecb8e0163f65fe25cb9a94078ce2f0bd 100644
GIT binary patch
delta 275
zcmZp8z~1nHeS$P&;6xc`#=ypetqF_^`?>iSF);E+Gw?_AM{ibC@aOk-WfEYMW&i?b
z1_llwB`Pg?<jvCDLjnvYhDOGQMkYoEMn<{@mb!+93I+yN#>Q4g26{$@W(I~vW+3S&
zJ9Zfv8yf<3#!X)~pD~)7{|nHD=M4PM`JZnVEV#`-`G7vF64Xd0pfVoOBOBgK2Aa<c
z<S_F~F!1l-kKva9x`vD2#fh1ZO<GhK>KYDV(Iam^H8;WC0&)@1QZy%7S{WGX8Ch5w
gSy-49rIt^R+0VFQGmFD*eh#Q^=IzhVGfFA|0LU^(X#fBK

delta 106
zcmV-w0G0oM;0J)<2ap>9PLUi#0ZxHnwO|3Ej|l((009r801u+G5kQy^1Y7|S2A8Iv
z0b8>Hp!g3H#IWp>!Vmxr000024_p8bxDQ;jAs|o>mt4OAs0acN=Kv4%59hNHaN7@)
Mz%K>2?9TxdAOdY7#{d8T

diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs
index 887d398a..37776e4f 100644
--- a/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Interface/IUserService.cs
@@ -10,6 +10,12 @@ namespace Yi.Framework.Interface
 {
    public partial interface IUserService
     {
+        /// <summary>
+        /// 关联角色测试
+        /// </summary>
+        /// <returns></returns>
+        Task<List<UserEntity>> GetListInRole();
+
         /// <summary>
         /// 测试仓储的上下文对象
         /// </summary>
@@ -34,10 +40,10 @@ namespace Yi.Framework.Interface
         Task<bool> Register(UserEntity userEntity, Action<UserEntity> userAction = null);
 
         /// <summary>
-        /// 导航属性关联角色
+        /// 导航属性关联角色、部门、岗位
         /// </summary>
         /// <returns></returns>
-        Task<List<UserEntity>> GetListInRole();
+        Task<UserEntity> GetInfoById(long userId);
 
         /// <summary>
         /// 给用户设置角色，多用户，多角色
@@ -55,13 +61,6 @@ namespace Yi.Framework.Interface
         /// <returns></returns>
         Task<bool> Exist(string userName, Action<UserEntity> userAction = null);
 
-        /// <summary>
-        /// 通过用户id得到角色列表
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        Task<List<RoleEntity>> GetRoleListByUserId(long userId);
-
         /// <summary>
         /// 获取当前登录用户的所有信息
         /// </summary>
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
index 5f6a7ce3..7bc07bb8 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Yi.Framework.Model.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="NEST" Version="7.16.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.2.7" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.2.8-preview04" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
index cef8cf52..1be9b474 100644
--- a/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
@@ -16,6 +16,10 @@ namespace Yi.Framework.Service
 {
     public partial class UserService
     {
+        public async Task<List<UserEntity>> GetListInRole()
+        {
+            return await _repository._DbQueryable.Includes(u => u.Roles).ToListAsync();
+        }
         public async Task<List<UserEntity>> DbTest()
         {
             return await _repository._Db.Queryable<UserEntity>().ToListAsync();
@@ -64,23 +68,12 @@ namespace Yi.Framework.Service
             {
                 user.UserName = userEntity.UserName;
                 user.BuildPassword();
-                //等待老杰哥更新，杰哥漏了雪花id呀，嘿嘿
-                //var entity = await _repository.InsertReturnSnowflakeEntityAsync(user);
-                //userAction.Invoke(await _repository.GetByIdAsync(entity));
-
-                //await _repository.InsertReturnSnowflakeEntityAsync(user);
-                //userAction.Invoke(await _repository.GetByIdAsync(user));
-
+                userAction.Invoke(await _repository.InsertReturnEntityAsync(user));
                 return true;
             }
             return false;
         }
 
-        public async Task<List<UserEntity>> GetListInRole()
-        {
-            return await _repository._DbQueryable.Includes(u => u.Roles).ToListAsync();
-        }
-
         public async Task<bool> GiveUserSetRole(List<long> userIds, List<long> roleIds)
         {
             var _repositoryUserRole = _repository.ChangeRepository<Repository<UserRoleEntity>>();
@@ -109,9 +102,9 @@ namespace Yi.Framework.Service
         }
 
 
-        public async Task<List<RoleEntity>> GetRoleListByUserId(long userId)
+        public async Task<UserEntity> GetInfoById(long userId)
         {
-            return (await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId)).Roles;
+            return await _repository._DbQueryable.Includes(u => u.Roles).InSingleAsync(userId);
         }
 
         public async Task<UserRoleMenuDto> GetUserAllInfo(long userId)
@@ -179,7 +172,8 @@ namespace Yi.Framework.Service
                      .WhereIF(!string.IsNullOrEmpty(user.Name), u => u.Name.Contains(user.Name))
                      .WhereIF(!string.IsNullOrEmpty(user.Phone), u => u.Phone.Contains(user.Phone))
                     .WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
-                     .Where(u => u.IsDeleted == false)
+                     .Where(u => u.IsDeleted == user.IsDeleted)
+                     .Includes(u => u.Roles)
                     .OrderBy(u => u.OrderNum, OrderByType.Desc)
                     .ToPageListAsync(page.PageNum, page.PageSize, total);
 
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/role.js b/Yi.Vue3.X.RuoYi/src/api/system/role.js
index a772d126..5f65dfe0 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/role.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/role.js
@@ -117,3 +117,10 @@ export function deptTreeSelect(roleId) {
     method: 'get'
   })
 }
+// 获取角色选择框列表
+export function roleOptionselect() {
+  return request({
+    url: '/role/getList',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/Yi.Vue3.X.RuoYi/src/api/system/user.js b/Yi.Vue3.X.RuoYi/src/api/system/user.js
index d206052b..c94146bd 100644
--- a/Yi.Vue3.X.RuoYi/src/api/system/user.js
+++ b/Yi.Vue3.X.RuoYi/src/api/system/user.js
@@ -13,7 +13,7 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
   return request({
-    url: '/system/user/' + parseStrEmpty(userId),
+    url: '/user/getById/' + parseStrEmpty(userId),
     method: 'get'
   })
 }
diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
index d80094ff..c4b1a5a5 100644
--- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
+++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue
@@ -1,357 +1,245 @@
 <template>
-  <div class="app-container">
-     <el-row :gutter="20">
-        <!--部门数据-->
-        <el-col :span="4" :xs="24">
-           <div class="head-container">
-              <el-input
-                 v-model="deptName"
-                 placeholder="请输入部门名称"
-                 clearable
-                 prefix-icon="Search"
-                 style="margin-bottom: 20px"
-              />
-           </div>
-           <div class="head-container">
-              <el-tree
-                 :data="deptOptions"
-                 :props="{ label: 'label', children: 'children' }"
-                 :expand-on-click-node="false"
-                 :filter-node-method="filterNode"
-                 ref="deptTreeRef"
-                 highlight-current
-                 default-expand-all
-                 @node-click="handleNodeClick"
-              />
-           </div>
-        </el-col>
-        <!--用户数据-->
-        <el-col :span="20" :xs="24">
-           <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                 <el-input
-                    v-model="queryParams.userName"
-                    placeholder="请输入用户名称"
-                    clearable
-                    style="width: 240px"
-                    @keyup.enter="handleQuery"
-                 />
-              </el-form-item>
-              <el-form-item label="手机号码" prop="phone">
-                 <el-input
-                    v-model="queryParams.phone"
-                    placeholder="请输入手机号码"
-                    clearable
-                    style="width: 240px"
-                    @keyup.enter="handleQuery"
-                 />
-              </el-form-item>
-              <el-form-item label="状态" prop="isDeleted">
-                 <el-select
-                    v-model="queryParams.isDeleted"
-                    placeholder="用户状态"
-                    clearable
-                    style="width: 240px"
-                 >
-                    <el-option
-                       v-for="dict in sys_normal_disable"
-                       :key="dict.value"
-                       :label="dict.label"
-                       :value="dict.value"
-                    />
-                 </el-select>
-              </el-form-item>
-              <el-form-item label="创建时间" style="width: 308px;">
-                 <el-date-picker
-                    v-model="dateRange"
-                    value-format="YYYY-MM-DD"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                 ></el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              </el-form-item>
-           </el-form>
+   <div class="app-container">
+      <el-row :gutter="20">
+         <!--部门数据-->
+         <el-col :span="4" :xs="24">
+            <div class="head-container">
+               <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
+                  style="margin-bottom: 20px" />
+            </div>
+            <div class="head-container">
+               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
+                  :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" highlight-current
+                  default-expand-all @node-click="handleNodeClick" />
+            </div>
+         </el-col>
+         <!--用户数据-->
+         <el-col :span="20" :xs="24">
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+               <el-form-item label="用户名称" prop="userName">
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                     @keyup.enter="handleQuery" />
+               </el-form-item>
+               <el-form-item label="手机号码" prop="phone">
+                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
+                     @keyup.enter="handleQuery" />
+               </el-form-item>
+               <el-form-item label="状态" prop="isDeleted">
+                  <el-select v-model="queryParams.isDeleted" placeholder="用户状态" clearable style="width: 240px">
+                     <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                        :value="dict.value" />
+                  </el-select>
+               </el-form-item>
+               <el-form-item label="创建时间" style="width: 308px;">
+                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+                     start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+               </el-form-item>
+               <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+               </el-form-item>
+            </el-form>
 
-           <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                 <el-button
-                    type="primary"
-                    plain
-                    icon="Plus"
-                    @click="handleAdd"
-                    v-hasPermi="['system:user:add']"
-                 >新增</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                 <el-button
-                    type="success"
-                    plain
-                    icon="Edit"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['system:user:edit']"
-                 >修改</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                 <el-button
-                    type="danger"
-                    plain
-                    icon="Delete"
-                    :disabled="multiple"
-                    @click="handleDelete"
-                    v-hasPermi="['system:user:remove']"
-                 >删除</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                 <el-button
-                    type="info"
-                    plain
-                    icon="Upload"
-                    @click="handleImport"
-                    v-hasPermi="['system:user:import']"
-                 >导入</el-button>
-              </el-col>
-              <el-col :span="1.5">
-                 <el-button
-                    type="warning"
-                    plain
-                    icon="Download"
-                    @click="handleExport"
-                    v-hasPermi="['system:user:export']"
-                 >导出</el-button>
-              </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-           </el-row>
+            <el-row :gutter="10" class="mb8">
+               <el-col :span="1.5">
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增
+                  </el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+                     v-hasPermi="['system:user:edit']">修改</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+                     v-hasPermi="['system:user:remove']">删除</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">
+                     导入</el-button>
+               </el-col>
+               <el-col :span="1.5">
+                  <el-button type="warning" plain icon="Download" @click="handleExport"
+                     v-hasPermi="['system:user:export']">导出</el-button>
+               </el-col>
+               <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+            </el-row>
 
-           <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
-              <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" />
-              <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
-              <el-table-column label="状态" align="isDeleted" key="isDeleted" v-if="columns[5].visible">
-                 <template #default="scope">
-                    <el-switch
-                       v-model="scope.row.isDeleted"
-                       :active-value=false
-                       :inactive-value=true
-                       @change="handleStatusChange(scope.row)"
-                    ></el-switch>
-                 </template>
-              </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-                 <template #default="scope">
-                    <span>{{ parseTime(scope.row.createTime) }}</span>
-                 </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-                 <template #default="scope">
-                    <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
-                       <el-button
-                          type="text"
-                          icon="Edit"
-                          @click="handleUpdate(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                       ></el-button>
-                    </el-tooltip>
-                    <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
-                       <el-button
-                          type="text"
-                          icon="Delete"
-                          @click="handleDelete(scope.row)"
-                          v-hasPermi="['system:user:remove']"
-                       ></el-button>
-                    </el-tooltip>
-                    <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
-                       <el-button
-                          type="text"
-                          icon="Key"
-                          @click="handleResetPwd(scope.row)"
-                          v-hasPermi="['system:user:resetPwd']"
-                       ></el-button>
-                    </el-tooltip>
-                    <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
-                       <el-button
-                          type="text"
-                          icon="CircleCheck"
-                          @click="handleAuthRole(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                       ></el-button>
-                    </el-tooltip>
-                 </template>
-              </el-table-column>
-           </el-table>
-           <pagination
-              v-show="total > 0"
-              :total="total"
-              v-model:page="queryParams.pageNum"
-              v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-           />
-        </el-col>
-     </el-row>
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+               <el-table-column type="selection" width="50" align="center" />
+               <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[0].visible" />
+               <el-table-column label="用户名称" align="center" key="name" prop="name" v-if="columns[1].visible"
+                  :show-overflow-tooltip="true" />
+               <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible"
+                  :show-overflow-tooltip="true" />
+               <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                  :show-overflow-tooltip="true" />
+               <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
+                  width="120" />
+               <el-table-column label="状态" align="isDeleted" key="isDeleted" v-if="columns[5].visible">
+                  <template #default="scope">
+                     <el-switch v-model="scope.row.isDeleted" :active-value=false :inactive-value=true
+                        @change="handleStatusChange(scope.row)"></el-switch>
+                  </template>
+               </el-table-column>
+               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+                  <template #default="scope">
+                     <span>{{ parseTime(scope.row.createTime) }}</span>
+                  </template>
+               </el-table-column>
+               <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+                  <template #default="scope">
+                     <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
+                           v-hasPermi="['system:user:edit']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['system:user:remove']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button type="text" icon="Key" @click="handleResetPwd(scope.row)"
+                           v-hasPermi="['system:user:resetPwd']"></el-button>
+                     </el-tooltip>
+                     <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
+                        <el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
+                           v-hasPermi="['system:user:edit']"></el-button>
+                     </el-tooltip>
+                  </template>
+               </el-table-column>
+            </el-table>
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+               v-model:limit="queryParams.pageSize" @pagination="getList" />
+         </el-col>
+      </el-row>
 
-     <!-- 添加或修改用户配置对话框 -->
-     <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-        <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
-           <el-row>
-              <el-col :span="12">
-                 <el-form-item label="用户昵称" prop="nickName">
-                    <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                 <el-form-item label="归属部门" prop="deptId">
-                    <el-tree-select
-                       v-model="form.deptId"
-                       :data="deptOptions"
-                       :props="{ value: 'id', label: 'label', children: 'children' }"
-                       value-key="id"
-                       placeholder="请选择归属部门"
-                       check-strictly
-                    />
-                 </el-form-item>
-              </el-col>
-           </el-row>
-           <el-row>
-              <el-col :span="12">
-                 <el-form-item label="手机号码" prop="phonenumber">
-                    <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                 <el-form-item label="邮箱" prop="email">
-                    <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-                 </el-form-item>
-              </el-col>
-           </el-row>
-           <el-row>
-              <el-col :span="12">
-                 <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-                    <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                 <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-                    <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-                 </el-form-item>
-              </el-col>
-           </el-row>
-           <el-row>
-              <el-col :span="12">
-                 <el-form-item label="用户性别">
-                    <el-select v-model="form.sex" placeholder="请选择">
-                       <el-option
-                          v-for="dict in sys_user_sex"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                       ></el-option>
-                    </el-select>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                 <el-form-item label="状态">
-                    <el-radio-group v-model="form.status">
-                       <el-radio
-                          v-for="dict in sys_normal_disable"
-                          :key="dict.value"
-                          :label="dict.value"
-                       >{{ dict.label }}</el-radio>
-                    </el-radio-group>
-                 </el-form-item>
-              </el-col>
-           </el-row>
-           <el-row>
-              <el-col :span="12">
-                 <el-form-item label="岗位">
-                    <el-select v-model="form.postIds" multiple placeholder="请选择">
-                       <el-option
-                          v-for="item in postOptions"
-                          :key="item.postId"
-                          :label="item.postName"
-                          :value="item.postId"
-                          :disabled="item.status == 1"
-                       ></el-option>
-                    </el-select>
-                 </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                 <el-form-item label="角色">
-                    <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                       <el-option
-                          v-for="item in roleOptions"
-                          :key="item.roleId"
-                          :label="item.roleName"
-                          :value="item.roleId"
-                          :disabled="item.status == 1"
-                       ></el-option>
-                    </el-select>
-                 </el-form-item>
-              </el-col>
-           </el-row>
-           <el-row>
-              <el-col :span="24">
-                 <el-form-item label="备注">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-                 </el-form-item>
-              </el-col>
-           </el-row>
-        </el-form>
-        <template #footer>
-           <div class="dialog-footer">
-              <el-button type="primary" @click="submitForm">确 定</el-button>
-              <el-button @click="cancel">取 消</el-button>
-           </div>
-        </template>
-     </el-dialog>
+      <!-- 添加或修改用户配置对话框 -->
+      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+         <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="用户昵称" prop="nick">
+                     <el-input v-model="form.user.nick" placeholder="请输入用户昵称" maxlength="30" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="归属部门" prop="deptId">
+                     <el-tree-select v-model="form.deptId" :data="deptOptions"
+                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
+                        placeholder="请选择归属部门" check-strictly />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="手机号码" prop="phone">
+                     <el-input v-model="form.user.phone" placeholder="请输入手机号码" maxlength="11" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="邮箱" prop="email">
+                     <el-input v-model="form.user.email" placeholder="请输入邮箱" maxlength="50" />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+                     <el-input v-model="form.user.userName" placeholder="请输入用户名称" maxlength="30" />
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+                     <el-input v-model="form.user.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password />
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="用户性别">
+                     <el-select v-model="form.user.sex" placeholder="请选择">
+                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
+                           :value="dict.value"></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="状态">
+                     <el-radio-group v-model="form.user.isDeleted">
+                        <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
+                        }}</el-radio>
+                     </el-radio-group>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="12">
+                  <el-form-item label="岗位">
+                     <el-select v-model="form.postIds" multiple placeholder="请选择">
+                        <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
+                           :value="item.postId" :disabled="item.status == 1"></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="角色">
+                     <el-select v-model="form.roleIds" multiple placeholder="请选择">
+                        <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName"
+                           :value="item.id" :disabled="item.isDeleted ==true"></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+            <el-row>
+               <el-col :span="24">
+                  <el-form-item label="备注">
+                     <el-input v-model="form.user.remark" type="textarea" placeholder="请输入内容"></el-input>
+                  </el-form-item>
+               </el-col>
+            </el-row>
+         </el-form>
+         <template #footer>
+            <div class="dialog-footer">
+               <el-button type="primary" @click="submitForm">确 定</el-button>
+               <el-button @click="cancel">取 消</el-button>
+            </div>
+         </template>
+      </el-dialog>
 
-     <!-- 用户导入对话框 -->
-     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-        <el-upload
-           ref="uploadRef"
-           :limit="1"
-           accept=".xlsx, .xls"
-           :headers="upload.headers"
-           :action="upload.url + '?updateSupport=' + upload.updateSupport"
-           :disabled="upload.isUploading"
-           :on-progress="handleFileUploadProgress"
-           :on-success="handleFileSuccess"
-           :auto-upload="false"
-           drag
-        >
-           <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-           <template #tip>
-              <div class="el-upload__tip text-center">
-                 <div class="el-upload__tip">
-                    <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                 </div>
-                 <span>仅允许导入xls、xlsx格式文件。</span>
-                 <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-              </div>
-           </template>
-        </el-upload>
-        <template #footer>
-           <div class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-           </div>
-        </template>
-     </el-dialog>
-  </div>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+         <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+            <el-icon class="el-icon--upload">
+               <upload-filled />
+            </el-icon>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <template #tip>
+               <div class="el-upload__tip text-center">
+                  <div class="el-upload__tip">
+                     <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  </div>
+                  <span>仅允许导入xls、xlsx格式文件。</span>
+                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                     @click="importTemplate">下载模板</el-link>
+               </div>
+            </template>
+         </el-upload>
+         <template #footer>
+            <div class="dialog-footer">
+               <el-button type="primary" @click="submitFileForm">确 定</el-button>
+               <el-button @click="upload.open = false">取 消</el-button>
+            </div>
+         </template>
+      </el-dialog>
+   </div>
 </template>
 
 <script setup name="User">
 import { getToken } from "@/utils/auth";
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
-
+import { roleOptionselect } from "@/api/system/role";
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
@@ -373,251 +261,261 @@ const postOptions = ref([]);
 const roleOptions = ref([]);
 /*** 用户导入参数 */
 const upload = reactive({
- // 是否显示弹出层（用户导入）
- open: false,
- // 弹出层标题（用户导入）
- title: "",
- // 是否禁用上传
- isUploading: false,
- // 是否更新已经存在的用户数据
- updateSupport: 0,
- // 设置上传的请求头部
- headers: { Authorization: "Bearer " + getToken() },
- // 上传的地址
- url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
+   // 是否显示弹出层（用户导入）
+   open: false,
+   // 弹出层标题（用户导入）
+   title: "",
+   // 是否禁用上传
+   isUploading: false,
+   // 是否更新已经存在的用户数据
+   updateSupport: 0,
+   // 设置上传的请求头部
+   headers: { Authorization: "Bearer " + getToken() },
+   // 上传的地址
+   url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
 });
 // 列显隐信息
 const columns = ref([
- { key: 0, label: `用户编号`, visible: true },
- { key: 1, label: `用户名称`, visible: true },
- { key: 2, label: `用户昵称`, visible: true },
- { key: 3, label: `部门`, visible: true },
- { key: 4, label: `手机号码`, visible: true },
- { key: 5, label: `状态`, visible: true },
- { key: 6, label: `创建时间`, visible: true }
+   { key: 0, label: `用户编号`, visible: true },
+   { key: 1, label: `用户名称`, visible: true },
+   { key: 2, label: `用户昵称`, visible: true },
+   { key: 3, label: `部门`, visible: true },
+   { key: 4, label: `手机号码`, visible: true },
+   { key: 5, label: `状态`, visible: true },
+   { key: 6, label: `创建时间`, visible: true }
 ]);
 
 const data = reactive({
- form: {},
- queryParams: {
-   pageNum: 1,
-   pageSize: 10,
-   userName: undefined,
-   phone: undefined,
-   isDeleted: undefined,
-   deptId: undefined
- },
- rules: {
-   userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
-   nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-   password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
-   email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-   phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
- }
+   form: {},
+   queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      userName: undefined,
+      phone: undefined,
+      isDeleted: undefined,
+      deptId: undefined
+   },
+   rules: {
+      userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
+      nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+      email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
+      phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
 
 /** 通过条件过滤节点  */
 const filterNode = (value, data) => {
- if (!value) return true;
- return data.label.indexOf(value) !== -1;
+   if (!value) return true;
+   return data.label.indexOf(value) !== -1;
 };
 /** 根据名称筛选部门树 */
 watch(deptName, val => {
- proxy.$refs["deptTreeRef"].filter(val);
+   proxy.$refs["deptTreeRef"].filter(val);
 });
 /** 查询部门下拉树结构 */
 function getDeptTree() {
- deptTreeSelect().then(response => {
-   deptOptions.value = response.data;
- });
+   deptTreeSelect().then(response => {
+      deptOptions.value = response.data;
+   });
 };
 /** 查询用户列表 */
 function getList() {
- loading.value = true;
- listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+   loading.value = true;
+   listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
 
-   loading.value = false;
-   userList.value = res.data.data;
-   total.value = res.data.total;
- });
+      loading.value = false;
+      userList.value = res.data.data;
+      total.value = res.data.total;
+   });
 };
 /** 节点单击事件 */
 function handleNodeClick(data) {
- queryParams.value.deptId = data.id;
- handleQuery();
+   queryParams.value.deptId = data.id;
+   handleQuery();
 };
 /** 搜索按钮操作 */
 function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+   queryParams.value.pageNum = 1;
+   getList();
 };
 /** 重置按钮操作 */
 function resetQuery() {
- dateRange.value = [];
- proxy.resetForm("queryRef");
- handleQuery();
+   dateRange.value = [];
+   proxy.resetForm("queryRef");
+   handleQuery();
 };
 /** 删除按钮操作 */
 function handleDelete(row) {
- const userIds = row.userId || ids.value;
- proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
-   return delUser(userIds);
- }).then(() => {
-   getList();
-   proxy.$modal.msgSuccess("删除成功");
- }).catch(() => {});
+   const userIds = row.userId || ids.value;
+   proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+      return delUser(userIds);
+   }).then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+   }).catch(() => { });
 };
 /** 导出按钮操作 */
 function handleExport() {
- proxy.download("system/user/export", {
-   ...queryParams.value,
- },`user_${new Date().getTime()}.xlsx`);
+   proxy.download("system/user/export", {
+      ...queryParams.value,
+   }, `user_${new Date().getTime()}.xlsx`);
 };
 /** 用户状态修改  */
 function handleStatusChange(row) {
- let text = row.isDeleted === false ? "启用" : "停用";
- proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
-   return changeUserStatus(row.id, row.isDeleted);
- }).then(() => {
-   proxy.$modal.msgSuccess(text + "成功");
- }).catch(function () {
-   row.isDeleted = row.isDeleted === true ? false : true;
- });
+   let text = row.isDeleted === false ? "启用" : "停用";
+   proxy.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗?').then(function () {
+      return changeUserStatus(row.id, row.isDeleted);
+   }).then(() => {
+      proxy.$modal.msgSuccess(text + "成功");
+   }).catch(function () {
+      row.isDeleted = row.isDeleted === true ? false : true;
+   });
 };
 /** 更多操作 */
 function handleCommand(command, row) {
- switch (command) {
-   case "handleResetPwd":
-     handleResetPwd(row);
-     break;
-   case "handleAuthRole":
-     handleAuthRole(row);
-     break;
-   default:
-     break;
- }
+   switch (command) {
+      case "handleResetPwd":
+         handleResetPwd(row);
+         break;
+      case "handleAuthRole":
+         handleAuthRole(row);
+         break;
+      default:
+         break;
+   }
 };
 /** 跳转角色分配 */
 function handleAuthRole(row) {
- const userId = row.userId;
- router.push("/system/user-auth/role/" + userId);
+   const userId = row.userId;
+   router.push("/system/user-auth/role/" + userId);
 };
 /** 重置密码按钮操作 */
 function handleResetPwd(row) {
- proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-   confirmButtonText: "确定",
-   cancelButtonText: "取消",
-   closeOnClickModal: false,
-   inputPattern: /^.{5,20}$/,
-   inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
- }).then(({ value }) => {
-   resetUserPwd(row.userId, value).then(response => {
-     proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
-   });
- }).catch(() => {});
+   proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      closeOnClickModal: false,
+      inputPattern: /^.{5,20}$/,
+      inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+   }).then(({ value }) => {
+      resetUserPwd(row.userId, value).then(response => {
+         proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
+      });
+   }).catch(() => { });
 };
 /** 选择条数  */
 function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.userId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+   ids.value = selection.map(item => item.userId);
+   single.value = selection.length != 1;
+   multiple.value = !selection.length;
 };
 /** 导入按钮操作 */
 function handleImport() {
- upload.title = "用户导入";
- upload.open = true;
+   upload.title = "用户导入";
+   upload.open = true;
 };
 /** 下载模板操作 */
 function importTemplate() {
- proxy.download("system/user/importTemplate", {
- }, `user_template_${new Date().getTime()}.xlsx`);
+   proxy.download("system/user/importTemplate", {
+   }, `user_template_${new Date().getTime()}.xlsx`);
 };
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
- upload.isUploading = true;
+   upload.isUploading = true;
 };
 /** 文件上传成功处理 */
 const handleFileSuccess = (response, file, fileList) => {
- upload.open = false;
- upload.isUploading = false;
- proxy.$refs["uploadRef"].handleRemove(file);
- proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
- getList();
+   upload.open = false;
+   upload.isUploading = false;
+   proxy.$refs["uploadRef"].handleRemove(file);
+   proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+   getList();
 };
 /** 提交上传文件 */
 function submitFileForm() {
- proxy.$refs["uploadRef"].submit();
+   proxy.$refs["uploadRef"].submit();
 };
 /** 重置操作表单 */
 function reset() {
- form.value = {
-   userId: undefined,
-   deptId: undefined,
-   userName: undefined,
-   nickName: undefined,
-   password: undefined,
-   phonenumber: undefined,
-   email: undefined,
-   sex: undefined,
-   status: "0",
-   remark: undefined,
-   postIds: [],
-   roleIds: []
- };
- proxy.resetForm("userRef");
+   form.value = {
+      user: {
+         userName: undefined,
+         nick:undefined,
+         password: undefined,
+         phone: undefined,
+         email: undefined,
+         sex: undefined,
+         isDeleted: false,
+         remark: undefined,
+      },
+      postIds: [],
+      roleIds: [],
+      deptId: undefined
+   };
+   proxy.resetForm("userRef");
 };
 /** 取消按钮 */
 function cancel() {
- open.value = false;
- reset();
+   open.value = false;
+   reset();
 };
 /** 新增按钮操作 */
 function handleAdd() {
- reset();
- getUser().then(response => {
-   postOptions.value = response.posts;
-   roleOptions.value = response.roles;
-   open.value = true;
-   title.value = "添加用户";
-   form.value.password = initPassword.value;
- });
+   reset();
+   getUser().then(response => {
+      postOptions.value = response.posts;
+      roleOptions.value = response.roles;
+      open.value = true;
+      title.value = "添加用户";
+      form.value.password = initPassword.value;
+   });
 };
 /** 修改按钮操作 */
 function handleUpdate(row) {
- reset();
- const userId = row.id || ids.value;
- getUser(userId).then(response => {
-   form.value = response.data;
-   postOptions.value = response.posts;
-   roleOptions.value = response.roles;
-   form.value.postIds = response.postIds;
-   form.value.roleIds = response.roleIds;
-   open.value = true;
-   title.value = "修改用户";
-   form.password = "";
- });
+   reset();
+   const userId = row.id || ids.value;
+   roleOptionselect().then(response=>{
+      //岗位从另一个接口获取全量
+      postOptions.value = [];
+      roleOptions.value = response.data;
+   })
+
+
+
+
+   getUser(userId).then(response => {
+      form.value.user = response.data;
+      form.value.postIds = [];
+      response.data.roles.forEach(role => {
+         form.value.roleIds.push(role.id)
+      });
+      open.value = true;
+      title.value = "修改用户";
+      form.password = "";
+   });
 };
 /** 提交按钮 */
 function submitForm() {
- proxy.$refs["userRef"].validate(valid => {
-   if (valid) {
-     if (form.value.userId != undefined) {
-       updateUser(form.value).then(response => {
-         proxy.$modal.msgSuccess("修改成功");
-         open.value = false;
-         getList();
-       });
-     } else {
-       addUser(form.value).then(response => {
-         proxy.$modal.msgSuccess("新增成功");
-         open.value = false;
-         getList();
-       });
-     }
-   }
- });
+   proxy.$refs["userRef"].validate(valid => {
+      if (valid) {
+         if (form.value.userId != undefined) {
+            updateUser(form.value).then(response => {
+               proxy.$modal.msgSuccess("修改成功");
+               open.value = false;
+               getList();
+            });
+         } else {
+            addUser(form.value).then(response => {
+               proxy.$modal.msgSuccess("新增成功");
+               open.value = false;
+               getList();
+            });
+         }
+      }
+   });
 };
 
 getDeptTree();