feat: 完善各个模块功能

Yi.Framework.Net6/src/framework/Yi.Framework.Data/Json/DateTimeJsonConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Data.Json
+{
+    public class DateTimeJsonConverter : JsonConverter<DateTime>
+    {
+        private readonly string Format;
+        public DateTimeJsonConverter(string format)
+        {
+            Format = format;
+        }
+        public override void Write(Utf8JsonWriter writer, DateTime date, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(date.ToString(Format));
+        }
+        public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return DateTime.ParseExact(reader.GetString(), Format, null);
+        }
+    }
+
+
+}

Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs

@@ -9,6 +9,7 @@ using Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection;
 using Yi.Framework.Core.Autofac;
 using Yi.RBAC.Application;
 using Yi.Framework.AspNetCore;
+using Yi.Framework.Data.Json;
 
 namespace Yi.BBS.Web
 {
@@ -23,7 +24,9 @@ namespace Yi.BBS.Web
         public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
         {
             //添加控制器与动态api
-            services.AddControllers();
+            services.AddControllers().AddJsonOptions(opt => {
+                opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+            }); 
             services.AddAutoApiService(opt =>
             {
                 //NETServiceTest所在程序集添加进动态api配置

Yi.Framework.Net6/src/project/Template/Yi.Template.Web/YiTemplateWebModule.cs

@@ -5,6 +5,7 @@ using Yi.Framework.Auth.JwtBearer;
 using Yi.Framework.Core;
 using Yi.Framework.Core.Attributes;
 using Yi.Framework.Core.Autofac;
+using Yi.Framework.Data.Json;
 using Yi.Template.Application;
 using Yi.Template.Sqlsugar;
 
@@ -21,7 +22,9 @@ namespace Yi.Template.Web
         public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
         {
             //添加控制器与动态api
-            services.AddControllers();
+            services.AddControllers().AddJsonOptions(opt => {
+                opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+            }); 
             services.AddAutoApiService(opt =>
             {
                 //NETServiceTest所在程序集添加进动态api配置

Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs

@@ -9,6 +9,7 @@ using Yi.Framework.AspNetCore.Microsoft.Extensions.DependencyInjection;
 using Yi.Framework.Core.Autofac;
 using Yi.RBAC.Application;
 using Yi.Framework.AspNetCore;
+using Yi.Framework.Data.Json;
 
 namespace Yi.BBS.Web
 {
@@ -23,7 +24,9 @@ namespace Yi.BBS.Web
         public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
         {
             //添加控制器与动态api
-            services.AddControllers();
+            services.AddControllers().AddJsonOptions(opt => {
+                opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+            }); 
             services.AddAutoApiService(opt =>
             {
                 //NETServiceTest所在程序集添加进动态api配置

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Dept/DeptGetListOutputDto.cs

@@ -18,5 +18,7 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? Leader { get; set; }
         public long ParentId { get; set; }
         public string? Remark { get; set; }
+
+        public int OrderNum { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Dept/DeptGetOutputDto.cs

@@ -17,5 +17,9 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? Remark { get; set; }
 
         public long? deptId { get; set; }
+
+        public int OrderNum { get; set; }
+
+        public long ParentId { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Menu/MenuGetListOutputDto.cs

@@ -26,6 +26,8 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? Remark { get; set; }
         public string? Component { get; set; }
         public string? Query { get; set; }
+
+        public int OrderNum { get; set; }
         //public List<MenuEntity>? Children { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Menu/MenuGetOutputDto.cs

@@ -26,6 +26,9 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? Remark { get; set; }
         public string? Component { get; set; }
         public string? Query { get; set; }
+
+        public int OrderNum { get; set; }
+
         //public List<MenuEntity>? Children { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Post/PostGetListOutputDto.cs

@@ -15,5 +15,7 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string PostCode { get; set; }=string.Empty;
         public string PostName { get; set; } = string.Empty;
         public string? Remark { get; set; }
+
+        public int OrderNum { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/Post/PostGetOutputDto.cs

@@ -16,5 +16,7 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string PostCode { get; set; }=string.Empty;
         public string PostName { get; set; } = string.Empty;
         public string? Remark { get; set; }
+
+        public int OrderNum { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListInputVo.cs

@@ -14,7 +14,9 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? UserName { get; set; }
         public long? Phone { get; set; }
 
-        public bool IsDeleted { get; set; }
+        public bool? State { get; set; }
+
+        public long? DeptId { get; set; }
 
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Identity/Dtos/User/UserGetListOutputDto.cs

@@ -14,8 +14,6 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public string? Name { get; set; }
         public int? Age { get; set; }
         public string UserName { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-        public string Salt { get; set; } = string.Empty;
         public string? Icon { get; set; }
         public string? Nick { get; set; }
         public string? Email { get; set; }
@@ -30,5 +28,8 @@ namespace Yi.RBAC.Application.Contracts.Identity.Dtos
         public long? CreatorId { get; set; }
 
         public bool State { get; set; }
+
+
+        public string DeptName { get; set; }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml

@@ -120,6 +120,14 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.RBAC.Application.Identity.RoleService.UpdateAsync(System.Int64,Yi.RBAC.Application.Contracts.Identity.Dtos.RoleUpdateInputVo)">
+            <summary>
+            修改角色
+            </summary>
+            <param name="id"></param>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.RBAC.Application.Identity.UserService">
             <summary>
             User服务实现

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/RoleService.cs

@@ -41,5 +41,28 @@ namespace Yi.RBAC.Application.Identity
 
             return outputDto;
         }
+
+        /// <summary>
+        /// 修改角色
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public override async Task<RoleGetOutputDto> UpdateAsync(long id, RoleUpdateInputVo input)
+        {
+            var dto = new RoleGetOutputDto();
+            using (var uow = _unitOfWorkManager.CreateContext())
+            {
+                var entity = await _repository.GetByIdAsync(id);
+                await MapToEntityAsync(input, entity);
+                await _repository.UpdateAsync(entity);
+
+                await _roleManager.GiveRoleSetMenuAsync(new List<long> { id }, input.MenuIds);
+
+                dto = await MapToGetOutputDtoAsync(entity);
+                uow.Commit();
+            }
+            return dto;
+        }
     }
 }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Identity/UserService.cs

@@ -40,13 +40,21 @@ namespace Yi.RBAC.Application.Identity
 
             RefAsync<int> total = 0;
 
-            var entities = await _DbQueryable.WhereIF(!string.IsNullOrEmpty(input.UserName), x => x.UserName.Contains(input.UserName!)).
+            var outPut = await _DbQueryable.WhereIF(!string.IsNullOrEmpty(input.UserName), x => x.UserName.Contains(input.UserName!))
-                          WhereIF(input.Phone is not null, x => x.Phone.ToString()!.Contains(input.Phone.ToString()!)).
+                         .WhereIF(input.Phone is not null, x => x.Phone.ToString()!.Contains(input.Phone.ToString()!))
-                          WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name!.Contains(input.Name!)).
+                          .WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name!.Contains(input.Name!))
-                          WhereIF(input.StartTime is not null && input.EndTime is not null, x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime).ToPageListAsync(input.PageNum, input.PageSize, total);
+                          .WhereIF(input.State is not null, x => x.State == input.State)
+                          .WhereIF(input.StartTime is not null && input.EndTime is not null, x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
+
+                          //这个为过滤当前部门，加入数据权限后，将由数据权限控制
+                          .WhereIF(input.DeptId is not null, x => x.DeptId == input.DeptId)
+
+                          .LeftJoin<DeptEntity>((user, dept) => user.DeptId == dept.Id)
+                          .Select((user, dept) => new UserGetListOutputDto(), true)
+                          .ToPageListAsync(input.PageNum, input.PageSize, total);
 
             var result = new PagedResultDto<UserGetListOutputDto>();
-            result.Items = await MapToGetListOutputDtosAsync(entities);
+            result.Items = outPut;
             result.Total = total;
             return result;
         }

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml

@@ -123,6 +123,24 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.RBAC.Domain.Identity.AccountManager.UpdatePasswordAsync(System.Int64,System.String,System.String)">
+            <summary>
+            更新密码
+            </summary>
+            <param name="userId"></param>
+            <param name="newPassword"></param>
+            <param name="oldPassword"></param>
+            <returns></returns>
+            <exception cref="T:Yi.Framework.Core.Exceptions.UserFriendlyException"></exception>
+        </member>
+        <member name="M:Yi.RBAC.Domain.Identity.AccountManager.RestPasswordAsync(System.Int64,System.String)">
+            <summary>
+            重置密码
+            </summary>
+            <param name="userId"></param>
+            <param name="password"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.RBAC.Domain.Identity.Entities.DeptEntity">
              <summary>
              部门表

Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs

@@ -1,10 +1,12 @@
 using AspNetCore.Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Options;
 using StartupModules;
 using Yi.Framework.AspNetCore;
 using Yi.Framework.Auth.JwtBearer;
 using Yi.Framework.Core;
 using Yi.Framework.Core.Attributes;
 using Yi.Framework.Core.Autofac;
+using Yi.Framework.Data.Json;
 using Yi.RBAC.Application;
 using Yi.RBAC.Sqlsugar;
 
@@ -21,7 +23,11 @@ namespace Yi.RBAC.Web
         public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
         {
             //添加控制器与动态api
-            services.AddControllers();
+            services.AddControllers().AddJsonOptions(opt => {
+
+                opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+
+            });
             services.AddAutoApiService(opt =>
             {
                 //NETServiceTest所在程序集添加进动态api配置

Yi.Framework.Net6/src/project/template/Yi.Template.Web/YiTemplateWebModule.cs

@@ -5,6 +5,7 @@ using Yi.Framework.Auth.JwtBearer;
 using Yi.Framework.Core;
 using Yi.Framework.Core.Attributes;
 using Yi.Framework.Core.Autofac;
+using Yi.Framework.Data.Json;
 using Yi.Template.Application;
 using Yi.Template.Sqlsugar;
 
@@ -21,7 +22,9 @@ namespace Yi.Template.Web
         public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
         {
             //添加控制器与动态api
-            services.AddControllers();
+            services.AddControllers().AddJsonOptions(opt => {
+                opt.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+            }); 
             services.AddAutoApiService(opt =>
             {
                 //NETServiceTest所在程序集添加进动态api配置

Yi.RuoYi.Vue3/src/api/system/dept.js

@@ -37,7 +37,7 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/dept',
+    url: `/dept/${data.id}`,
     method: 'put',
     data: data
   })

Yi.RuoYi.Vue3/src/api/system/menu.js

@@ -45,7 +45,7 @@ export function addMenu(data) {
 // 修改菜单
 export function updateMenu(data) {
   return request({
-    url: '/menu',
+    url: `/menu/${data.id}`,
     method: 'put',
     data: data
   })

Yi.RuoYi.Vue3/src/api/system/post.js

@@ -29,7 +29,7 @@ export function addPost(data) {
 // 修改岗位
 export function updatePost(data) {
   return request({
-    url: '/post',
+    url: `/post/${data.id}`,
     method: 'put',
     data: data
   })

Yi.RuoYi.Vue3/src/api/system/role.js

@@ -31,7 +31,7 @@ export function addRole(data) {
 // 修改角色
 export function updateRole(data) {
   return request({
-    url: '/role',
+    url: `/role/${data.id}`,
     method: 'put',
     data: data
   })

Yi.RuoYi.Vue3/src/views/system/dept/index.vue

@@ -9,13 +9,13 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="isDeleted">
+         <el-form-item label="状态" prop="state">
-            <el-select v-model="queryParams.isDeleted" placeholder="部门状态" clearable>
+            <el-select v-model="queryParams.state" placeholder="部门状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="dict.value"
+                  :value="JSON.parse(dict.value)"
                />
             </el-select>
          </el-form-item>
@@ -56,14 +56,14 @@
       >
          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-         <el-table-column prop="isDeleted" label="状态" width="100">
+         <el-table-column prop="state" label="状态" width="100">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="200">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -134,11 +134,11 @@
                </el-col>
                <el-col :span="12">
                   <el-form-item label="部门状态">
-                     <el-radio-group v-model="form.isDeleted">
+                     <el-radio-group v-model="form.state">
                         <el-radio
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
-                           :label="dict.value"
+                           :label="JSON.parse(dict.value)"
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -174,7 +174,7 @@ const data = reactive({
   form: {},
   queryParams: {
     deptName: undefined,
-    isDeleted: undefined
+    state: undefined
   },
   rules: {
     parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
@@ -204,13 +204,13 @@ function cancel() {
 function reset() {
   form.value = {
     id: undefined,
-    parentId: undefined,
+    parentId: 0,
     deptName: undefined,
     orderNum: 0,
     leader: undefined,
     phone: undefined,
     email: undefined,
-    isDeleted: false
+    state: true
   };
   proxy.resetForm("deptRef");
 }
@@ -227,11 +227,10 @@ function resetQuery() {
 function handleAdd(row) {
   reset();
   listDept().then(response => {
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
     deptOptions.value = proxy.handleTree(response.data, "id");
   });
   if (row != undefined) {
-    form.value.parentId = row.deptId;
+   console.log(row.deptId);
     form.value.parentId = row.id;
   }
   open.value = true;
@@ -248,12 +247,11 @@ function toggleExpandAll() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
-  listDeptExcludeChild(row.deptId).then(response => {
+
-    deptOptions.value = proxy.handleTree(response.data, "deptId");
   listDept().then(response => {
    //前端排除自己
-   
+
-    deptOptions.value = proxy.handleTree(response.data.filter(i=>i.id!=row.id), "id");
+    deptOptions.value = proxy.handleTree(response.data.items.filter(i=>i.id!=row.id), "id");
   });
 
   getDept(row.id).then(response => {
@@ -261,7 +259,7 @@ function handleUpdate(row) {
     open.value = true;
     title.value = "修改部门";
   });
-})
+
 }
 /** 提交按钮 */
 function submitForm() {

Yi.RuoYi.Vue3/src/views/system/menu/index.vue

@@ -9,8 +9,8 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="isDeleted">
+         <el-form-item label="状态" prop="state">
-            <el-select v-model="queryParams.isDeleted" placeholder="菜单状态" clearable>
+            <el-select v-model="queryParams.state" placeholder="菜单状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -64,14 +64,14 @@
          <el-table-column prop="permissionCode" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
          <el-table-column prop="router" label="路由" :show-overflow-tooltip="true"></el-table-column>
          <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-         <el-table-column prop="isDeleted" label="状态" width="80">
+         <el-table-column prop="state" label="状态" width="80">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime">
+         <el-table-column label="创建时间" align="center" prop="creationTime">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
@@ -273,7 +273,7 @@
                            菜单状态
                         </span>
                      </template>
-                     <el-radio-group v-model="form.isDeleted">
+                     <el-radio-group v-model="form.state">
                         <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -311,7 +311,9 @@ const showChooseIcon = ref(false);
 const iconSelectRef = ref(null);
 
 const data = reactive({
-  form: {},
+  form: {
+
+  },
   queryParams: {
     menuName: undefined,
     visible: undefined
@@ -359,7 +361,7 @@ function reset() {
     isLink: false,
     isCache: false,
     isShow: true,
-    isDeleted: false
+    state: true
   };
   proxy.resetForm("menuRef");
 }

Yi.RuoYi.Vue3/src/views/system/post/index.vue

@@ -17,13 +17,13 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="isDeleted">
+         <el-form-item label="状态" prop="state">
-            <el-select v-model="queryParams.isDeleted" placeholder="岗位状态" clearable>
+            <el-select v-model="queryParams.state" placeholder="岗位状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
                   :label="dict.label"
-                  :value="dict.value"
+                  :value="JSON.parse(dict.value)"
                />
             </el-select>
          </el-form-item>
@@ -81,14 +81,14 @@
          <el-table-column label="岗位编码" align="center" prop="postCode" />
          <el-table-column label="岗位名称" align="center" prop="postName" />
          <el-table-column label="岗位排序" align="center" prop="orderNum" />
-         <el-table-column label="状态" align="center" prop="isDeleted">
+         <el-table-column label="状态" align="center" prop="state">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -129,8 +129,8 @@
             <el-form-item label="岗位顺序" prop="orderNum">
                <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
-            <el-form-item label="岗位状态" prop="isDeleted">
+            <el-form-item label="岗位状态" prop="state">
-               <el-radio-group v-model="form.isDeleted">
+               <el-radio-group v-model="form.state">
                   <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
                </el-radio-group>
             </el-form-item>
@@ -171,7 +171,7 @@ const data = reactive({
     pageSize: 10,
     postCode: undefined,
     postName: undefined,
-    isDeleted: undefined
+    state: undefined
   },
   rules: {
     postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
@@ -203,7 +203,7 @@ function reset() {
     postCode: undefined,
     postName: undefined,
     orderNum: 0,
-    isDeleted: false,
+    state: false,
     remark: undefined
   };
   proxy.resetForm("postRef");

Yi.RuoYi.Vue3/src/views/system/role/index.vue

@@ -1,233 +1,100 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-      :model="queryParams"
-      ref="queryRef"
-      v-show="showSearch"
-      :inline="true"
-    >
       <el-form-item label="角色名称" prop="roleName">
-        <el-input
+        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
-          v-model="queryParams.roleName"
+          @keyup.enter="handleQuery" />
-          placeholder="请输入角色名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="权限字符" prop="roleCode">
-        <el-input
+        <el-input v-model="queryParams.roleCode" placeholder="请输入权限字符" clearable style="width: 240px"
-          v-model="queryParams.roleCode"
+          @keyup.enter="handleQuery" />
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="状态" prop="state">
-        <el-select
+        <el-select v-model="queryParams.state" placeholder="角色状态" clearable style="width: 240px">
-          v-model="queryParams.state"
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-          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
+        <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 type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          >搜索</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
+        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:role:add']">新增</el-button>
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['system:role: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:role:edit']">修改</el-button>
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:role: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:role:remove']">删除</el-button>
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-          >删除</el-button
-        >
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['system:role:export']"
-          >导出
         </el-button>
       </el-col>
-      <right-toolbar
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
     </el-row>
 
     <!-- 表格数据 -->
-    <el-table
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      v-loading="loading"
+      <el-table-column type="selection" width="50" align="center" />
-      :data="roleList"
+      <el-table-column label="角色编号" prop="roleCode"  />
-      @selection-change="handleSelectionChange"
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"  />
-    >
+      <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true"  />
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="显示顺序" prop="orderNum" />
-      <el-table-column label="角色编号" prop="roleCode" width="120" />
+      <el-table-column label="状态" align="center">
-      <el-table-column
-        label="角色名称"
-        prop="roleName"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column
-        label="权限字符"
-        prop="roleCode"
-        :show-overflow-tooltip="true"
-        width="150"
-      />
-      <el-table-column label="显示顺序" prop="orderNum" width="100" />
-      <el-table-column label="状态" align="center" width="100">
         <template #default="scope">
-          <el-switch
+          <el-switch v-model="scope.row.state" :active-value="true" :inactive-value="true"
-            v-model="scope.row.state"
+            @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">
+      <el-table-column label="创建时间" align="center" prop="creationTime">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <span>{{ parseTime(scope.row.creationTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template #default="scope">
-          <el-tooltip
+          <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
-            content="修改"
+            <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
-            placement="top"
-            v-if="scope.row.roleId !== 1"
-          >
-            <el-button
-              type="text"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:role:edit']"
-            >
             </el-button>
           </el-tooltip>
-          <el-tooltip
+          <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
-            content="删除"
+            <el-button type="text" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']">
-            placement="top"
-            v-if="scope.row.roleId !== 1"
-          >
-            <el-button
-              type="text"
-              icon="Delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:role:remove']"
-            >
             </el-button>
           </el-tooltip>
-          <el-tooltip
+          <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
-            content="数据权限"
+            <el-button type="text" icon="CircleCheck" @click="handleDataScope(scope.row)"
-            placement="top"
+              v-hasPermi="['system:role:edit']"></el-button>
-            v-if="scope.row.roleId !== 1"
-          >
-            <el-button
-              type="text"
-              icon="CircleCheck"
-              @click="handleDataScope(scope.row)"
-              v-hasPermi="['system:role:edit']"
-            ></el-button>
           </el-tooltip>
-          <el-tooltip
+          <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
-            content="分配用户"
+            <el-button type="text" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']">
-            placement="top"
-            v-if="scope.row.roleId !== 1"
-          >
-            <el-button
-              type="text"
-              icon="User"
-              @click="handleAuthUser(scope.row)"
-              v-hasPermi="['system:role: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-model:limit="queryParams.pageSize"
-      v-show="total > 0"
+      @pagination="getList" />
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form
+      <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
-        ref="roleRef"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-      >
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item prop="roleCode">
           <template #label>
             <span>
-              <el-tooltip
+              <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-                content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)"
-                placement="top"
-              >
                 <el-icon>
                   <question-filled />
                 </el-icon>
@@ -238,55 +105,25 @@
           <el-input v-model="form.roleCode" placeholder="请输入权限字符" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="orderNum">
-          <el-input-number
+          <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-            v-model="form.orderNum"
-            controls-position="right"
-            :min="0"
-          />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.state">
-            <el-radio
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{ dict.label
-              v-for="dict in sys_normal_disable"
+            }}</el-radio>
-              :key="dict.value"
-              :label="JSON.parse(dict.value)"
-              >{{ dict.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
-          <el-checkbox
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-            v-model="menuExpand"
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-            @change="handleCheckedTreeExpand($event, 'menu')"
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动
-            >展开/折叠</el-checkbox
-          >
-          <el-checkbox
-            v-model="menuNodeAll"
-            @change="handleCheckedTreeNodeAll($event, 'menu')"
-            >全选/全不选</el-checkbox
-          >
-          <el-checkbox
-            v-model="form.menuCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'menu')"
-            >父子联动
           </el-checkbox>
-          <el-tree
+          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menuRef" node-key="id"
-            class="tree-border"
+            :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍候"
-            :data="menuOptions"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
-            show-checkbox
-            ref="menuRef"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            v-model="form.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          ></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -298,12 +135,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog
+    <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
-      :title="title"
-      v-model="openDataScope"
-      width="500px"
-      append-to-body
-    >
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
@@ -312,46 +144,19 @@
           <el-input v-model="form.roleCode" :disabled="true" />
         </el-form-item>
         <el-form-item label="权限范围">
-          <el-select
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            v-model="form.dataScope"
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value">
-            @change="dataScopeSelectChange"
-          >
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="数据权限" v-show="form.dataScope == 1">
-          <el-checkbox
+          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-            v-model="deptExpand"
+          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-            @change="handleCheckedTreeExpand($event, 'dept')"
+          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动
-            >展开/折叠</el-checkbox
-          >
-          <el-checkbox
-            v-model="deptNodeAll"
-            @change="handleCheckedTreeNodeAll($event, 'dept')"
-            >全选/全不选</el-checkbox
-          >
-          <el-checkbox
-            v-model="form.deptCheckStrictly"
-            @change="handleCheckedTreeConnect($event, 'dept')"
-            >父子联动
           </el-checkbox>
-          <el-tree
+          <el-tree class="tree-border" :data="deptOptions" show-checkbox default-expand-all ref="deptRef" node-key="id"
-            class="tree-border"
+            :check-strictly="!form.deptCheckStrictly" empty-text="加载中，请稍候"
-            :data="deptOptions"
+            :props="{ label: 'label', children: 'children' }"></el-tree>
-            show-checkbox
-            default-expand-all
-            ref="deptRef"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -471,7 +276,7 @@ function handleDelete(row) {
       getList();
       proxy.$modal.msgSuccess("删除成功");
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -555,16 +360,16 @@ function reset() {
   deptExpand.value = true;
   deptNodeAll.value = false;
   form.value = {
-  
+
-      id: undefined,
+    id: undefined,
-      roleName: undefined,
+    roleName: undefined,
-      roleCode: undefined,
+    roleCode: undefined,
-      orderNum: 0,
+    orderNum: 0,
-      state: false,
+    state: false,
-      menuCheckStrictly: false,
+    menuCheckStrictly: false,
-      deptCheckStrictly: false,
+    deptCheckStrictly: false,
-      remark: undefined,
+    remark: undefined,
-      dataScope: 0,
+    dataScope: 0,
     menuIds: [],
     deptIds: [],
   };
@@ -583,7 +388,7 @@ function handleUpdate(row) {
   const roleId = row.id || ids.value;
   getRoleMenuTreeselect(roleId);
   getRole(roleId).then((response) => {
-    form.value= response.data;
+    form.value = response.data;
     form.value.orderNum = Number(form.value.orderNum);
     open.value = true;
     title.value = "修改角色";
@@ -597,18 +402,17 @@ function getRoleMenuTreeselect(roleId) {
 
   roleMenuTreeselect(roleId).then((response) => {
     const menuIds = [];
-    response.data.item.forEach((m) => {
+    response.data.forEach((m) => {
       menuIds.push(m.id);
     });
-
     nextTick(() => {
       menuIds.forEach((v) => {
         menuRef.value.setChecked(v, true, false);
       });
-
       //这里是要一个当前用户已拥有的菜单的id
     });
   });
+
 }
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {
@@ -629,9 +433,9 @@ function getDeptTree(roleId) {
     roleDeptTreeselect(roleId).then((response) => {
       deptIds = response.data.map((x) => x.id);
       // nextTick(() => {
-        if (deptRef.value) {
+      if (deptRef.value) {
-          deptRef.value.setCheckedKeys(deptIds);
+        deptRef.value.setCheckedKeys(deptIds);
-        }
+      }
       // });
     });
   });

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

@@ -27,7 +27,7 @@
                <el-form-item label="状态" prop="state">
                   <el-select v-model="queryParams.state" placeholder="用户状态" clearable style="width: 240px">
                      <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
-                        :value="dict.value" />
+                        :value="JSON.parse( dict.value)" />
                   </el-select>
                </el-form-item>
                <el-form-item label="创建时间" style="width: 308px;">
@@ -71,13 +71,13 @@
                   :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="dept.deptName" prop="dept.deptName" v-if="columns[3].visible"
+               <el-table-column label="部门" align="center" key="deptName" prop="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="state" key="state" v-if="columns[5].visible">
                   <template #default="scope">
-                     <el-switch v-model="scope.row.state" :active-value=false :inactive-value=true
+                     <el-switch v-model="scope.row.state" :active-value=true :inactive-value=false
                         @change="handleStatusChange(scope.row)"></el-switch>
                   </template>
                </el-table-column>