用户编辑界面

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>

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

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());

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)

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));
         }
     }
 }

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>

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>

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呀，嘿嘿
+                userAction.Invoke(await _repository.InsertReturnEntityAsync(user));
-                //var entity = await _repository.InsertReturnSnowflakeEntityAsync(user);
-                //userAction.Invoke(await _repository.GetByIdAsync(entity));
-
-                //await _repository.InsertReturnSnowflakeEntityAsync(user);
-                //userAction.Invoke(await _repository.GetByIdAsync(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);
 

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'
+  })
+}

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'
   })
 }

Yi.Vue3.X.RuoYi/src/views/system/user/index.vue

@@ -4,72 +4,35 @@
          <!--部门数据-->
          <el-col :span="4" :xs="24">
             <div class="head-container">
-              <el-input
+               <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search"
-                 v-model="deptName"
+                  style="margin-bottom: 20px" />
-                 placeholder="请输入部门名称"
-                 clearable
-                 prefix-icon="Search"
-                 style="margin-bottom: 20px"
-              />
             </div>
             <div class="head-container">
-              <el-tree
+               <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }"
-                 :data="deptOptions"
+                  :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" highlight-current
-                 :props="{ label: 'label', children: 'children' }"
+                  default-expand-all @node-click="handleNodeClick" />
-                 :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
+                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
-                    v-model="queryParams.userName"
+                     @keyup.enter="handleQuery" />
-                    placeholder="请输入用户名称"
-                    clearable
-                    style="width: 240px"
-                    @keyup.enter="handleQuery"
-                 />
                </el-form-item>
                <el-form-item label="手机号码" prop="phone">
-                 <el-input
+                  <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
-                    v-model="queryParams.phone"
+                     @keyup.enter="handleQuery" />
-                    placeholder="请输入手机号码"
-                    clearable
-                    style="width: 240px"
-                    @keyup.enter="handleQuery"
-                 />
                </el-form-item>
                <el-form-item label="状态" prop="isDeleted">
-                 <el-select
+                  <el-select v-model="queryParams.isDeleted" placeholder="用户状态" clearable style="width: 240px">
-                    v-model="queryParams.isDeleted"
+                     <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                    placeholder="用户状态"
+                        :value="dict.value" />
-                    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
+                  <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-                    v-model="dateRange"
+                     start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-                    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>
@@ -79,51 +42,24 @@
 
             <el-row :gutter="10" class="mb8">
                <el-col :span="1.5">
-                 <el-button
+                  <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增
-                    type="primary"
+                  </el-button>
-                    plain
-                    icon="Plus"
-                    @click="handleAdd"
-                    v-hasPermi="['system:user:add']"
-                 >新增</el-button>
                </el-col>
                <el-col :span="1.5">
-                 <el-button
+                  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-                    type="success"
+                     v-hasPermi="['system:user:edit']">修改</el-button>
-                    plain
-                    icon="Edit"
-                    :disabled="single"
-                    @click="handleUpdate"
-                    v-hasPermi="['system:user:edit']"
-                 >修改</el-button>
                </el-col>
                <el-col :span="1.5">
-                 <el-button
+                  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-                    type="danger"
+                     v-hasPermi="['system:user:remove']">删除</el-button>
-                    plain
-                    icon="Delete"
-                    :disabled="multiple"
-                    @click="handleDelete"
-                    v-hasPermi="['system:user:remove']"
-                 >删除</el-button>
                </el-col>
                <el-col :span="1.5">
-                 <el-button
+                  <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['system:user:import']">
-                    type="info"
+                     导入</el-button>
-                    plain
-                    icon="Upload"
-                    @click="handleImport"
-                    v-hasPermi="['system:user:import']"
-                 >导入</el-button>
                </el-col>
                <el-col :span="1.5">
-                 <el-button
+                  <el-button type="warning" plain icon="Download" @click="handleExport"
-                    type="warning"
+                     v-hasPermi="['system:user:export']">导出</el-button>
-                    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>
@@ -131,18 +67,18 @@
             <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="name" prop="name" v-if="columns[1].visible"
-              <el-table-column label="用户昵称" align="center" key="nick" prop="nick" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                  :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="nick" prop="nick" v-if="columns[2].visible"
-              <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
+                  :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
+                     <el-switch v-model="scope.row.isDeleted" :active-value=false :inactive-value=true
-                       v-model="scope.row.isDeleted"
+                        @change="handleStatusChange(scope.row)"></el-switch>
-                       :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">
@@ -153,47 +89,26 @@
                <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
+                        <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
-                          type="text"
+                           v-hasPermi="['system:user:edit']"></el-button>
-                          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
+                        <el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
-                          type="text"
+                           v-hasPermi="['system:user:remove']"></el-button>
-                          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
+                        <el-button type="text" icon="Key" @click="handleResetPwd(scope.row)"
-                          type="text"
+                           v-hasPermi="['system:user:resetPwd']"></el-button>
-                          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
+                        <el-button type="text" icon="CircleCheck" @click="handleAuthRole(scope.row)"
-                          type="text"
+                           v-hasPermi="['system:user:edit']"></el-button>
-                          icon="CircleCheck"
-                          @click="handleAuthRole(scope.row)"
-                          v-hasPermi="['system:user:edit']"
-                       ></el-button>
                      </el-tooltip>
                   </template>
                </el-table-column>
             </el-table>
-           <pagination
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-              v-show="total > 0"
+               v-model:limit="queryParams.pageSize" @pagination="getList" />
-              :total="total"
-              v-model:page="queryParams.pageNum"
-              v-model:limit="queryParams.pageSize"
-              @pagination="getList"
-           />
          </el-col>
       </el-row>
 
@@ -202,68 +117,57 @@
          <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
             <el-row>
                <el-col :span="12">
-                 <el-form-item label="用户昵称" prop="nickName">
+                  <el-form-item label="用户昵称" prop="nick">
-                    <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+                     <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
+                     <el-tree-select v-model="form.deptId" :data="deptOptions"
-                       v-model="form.deptId"
+                        :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id"
-                       :data="deptOptions"
+                        placeholder="请选择归属部门" check-strictly />
-                       :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-form-item label="手机号码" prop="phone">
-                    <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+                     <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.email" placeholder="请输入邮箱" maxlength="50" />
+                     <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.userName" placeholder="请输入用户名称" maxlength="30" />
+                     <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.password" placeholder="请输入用户密码" type="password" maxlength="20" show-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.sex" placeholder="请选择">
+                     <el-select v-model="form.user.sex" placeholder="请选择">
-                       <el-option
+                        <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label"
-                          v-for="dict in sys_user_sex"
+                           :value="dict.value"></el-option>
-                          :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-group v-model="form.user.isDeleted">
-                       <el-radio
+                        <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
-                          v-for="dict in sys_normal_disable"
+                        }}</el-radio>
-                          :key="dict.value"
-                          :label="dict.value"
-                       >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -272,26 +176,16 @@
                <el-col :span="12">
                   <el-form-item label="岗位">
                      <el-select v-model="form.postIds" multiple placeholder="请选择">
-                       <el-option
+                        <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName"
-                          v-for="item in postOptions"
+                           :value="item.postId" :disabled="item.status == 1"></el-option>
-                          :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
+                        <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName"
-                          v-for="item in roleOptions"
+                           :value="item.id" :disabled="item.isDeleted ==true"></el-option>
-                          :key="item.roleId"
-                          :label="item.roleName"
-                          :value="item.roleId"
-                          :disabled="item.status == 1"
-                       ></el-option>
                      </el-select>
                   </el-form-item>
                </el-col>
@@ -299,7 +193,7 @@
             <el-row>
                <el-col :span="24">
                   <el-form-item label="备注">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+                     <el-input v-model="form.user.remark" type="textarea" placeholder="请输入内容"></el-input>
                   </el-form-item>
                </el-col>
             </el-row>
@@ -314,19 +208,12 @@
 
       <!-- 用户导入对话框 -->
       <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-        <el-upload
+         <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-           ref="uploadRef"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-           :limit="1"
+            :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-           accept=".xlsx, .xls"
+            <el-icon class="el-icon--upload">
-           :headers="upload.headers"
+               <upload-filled />
-           :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            </el-icon>
-           :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">
@@ -334,7 +221,8 @@
                      <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>
+                  <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                     @click="importTemplate">下载模板</el-link>
                </div>
             </template>
          </el-upload>
@@ -351,7 +239,7 @@
 <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");
@@ -553,18 +441,19 @@ function submitFileForm() {
 /** 重置操作表单 */
 function reset() {
    form.value = {
-   userId: undefined,
+      user: {
-   deptId: undefined,
          userName: undefined,
-   nickName: undefined,
+         nick:undefined,
          password: undefined,
-   phonenumber: undefined,
+         phone: undefined,
          email: undefined,
          sex: undefined,
-   status: "0",
+         isDeleted: false,
          remark: undefined,
+      },
       postIds: [],
-   roleIds: []
+      roleIds: [],
+      deptId: undefined
    };
    proxy.resetForm("userRef");
 };
@@ -588,12 +477,21 @@ function handleAdd() {
 function handleUpdate(row) {
    reset();
    const userId = row.id || ids.value;
+   roleOptionselect().then(response=>{
+      //岗位从另一个接口获取全量
+      postOptions.value = [];
+      roleOptions.value = response.data;
+   })
+
+
+
+
    getUser(userId).then(response => {
-   form.value = response.data;
+      form.value.user = response.data;
-   postOptions.value = response.posts;
+      form.value.postIds = [];
-   roleOptions.value = response.roles;
+      response.data.roles.forEach(role => {
-   form.value.postIds = response.postIds;
+         form.value.roleIds.push(role.id)
-   form.value.roleIds = response.roleIds;
+      });
       open.value = true;
       title.value = "修改用户";
       form.password = "";