Ling0925
/
LFlow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

105040 Fix 初始化表错误

This commit is contained in:
lihanbo 2024-11-01 17:11:44 +08:00
parent 1f0cd62488
commit 97bc99e853
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LFlow.Permission/Model/PermissionModel.cs
View File

@ -3,7 +3,7 @@ using SqlSugar;
namespace LFlow.Permission.Model namespace LFlow.Permission.Model
{ {
[SugarTable("T_U_USERINFO")] [SugarTable("T_U_PERMISSION")]
public class PermissionModel : IDataModel public class PermissionModel : IDataModel
{ {
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey = true)]
@ -20,7 +20,7 @@ namespace LFlow.Permission.Model
/// <summary> /// <summary>
/// 权限对应程序ID /// 权限对应程序ID
/// </summary> /// </summary>
public string PermissionProgID public string ProgID
{ {
get; get;
set; set;
@ -28,7 +28,7 @@ namespace LFlow.Permission.Model
/// <summary> /// <summary>
/// 权限对应程序名称 /// 权限对应程序名称
/// </summary> /// </summary>
public string PermissionProgName public string ProgName
{ {
get; get;
set; set;

7
LFlow.Permission/PermissionModule.cs
View File

@ -1,8 +1,9 @@
using System.Reflection; using LFlow.Base.Interfaces;
using LFlow.Base.Interfaces;
using LFlow.Base.Utils; using LFlow.Base.Utils;
using LFlow.Permission.Model;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Serilog; using Serilog;
using System.Reflection;
namespace LFlow.Permission; namespace LFlow.Permission;
@ -11,7 +12,7 @@ public class PermissionModule : IModule
public void ConfigureModule(IServiceCollection services) public void ConfigureModule(IServiceCollection services)
{ {
CodeFirst.AddType(typeof(PermissionModule)); CodeFirst.AddType(typeof(PermissionModel));
var assembly = Assembly.GetAssembly(typeof(PermissionModule))!; var assembly = Assembly.GetAssembly(typeof(PermissionModule))!;
var types = assembly.GetTypes().ToList(); var types = assembly.GetTypes().ToList();
RegisterModule.RegisterAllService(types, services); RegisterModule.RegisterAllService(types, services);

2
LFlow.Permission/Service/PermissionService.cs
View File

@ -73,7 +73,7 @@ namespace LFlow.Permission.Service
{ {
return Task.FromResult(repo.Search(new PermissionModel return Task.FromResult(repo.Search(new PermissionModel
{ {
PermissionProgID = progID ProgID = progID
}).Adapt<List<PermissionDto>>()); }).Adapt<List<PermissionDto>>());
} }

2
LFlow.Role/Model/RoleModel.cs
View File

@ -3,7 +3,7 @@ using SqlSugar;
namespace LFlow.Role.Model namespace LFlow.Role.Model
{ {
[SugarTable("T_U_USERINFO")] [SugarTable("T_U_ROLE")]
public class RoleModel : IDataModel public class RoleModel : IDataModel
{ {
[SugarColumn(IsPrimaryKey = true)] [SugarColumn(IsPrimaryKey = true)]

1
LFlow.UserManagement/LFlow.UserManagement.csproj
View File

@ -12,6 +12,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\LFlow.Base\LFlow.Base.csproj" /> <ProjectReference Include="..\LFlow.Base\LFlow.Base.csproj" />
<ProjectReference Include="..\LFlow.Role\LFlow.Role.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
LFlow.UserManagement/Model/UserDto.cs
View File

@ -1,4 +1,5 @@
using LFlow.Base.Interfaces; using LFlow.Base.Interfaces;
using LFlow.Role.Model;
namespace LFlow.UserManagement.Model namespace LFlow.UserManagement.Model
{ {
@ -23,5 +24,10 @@ namespace LFlow.UserManagement.Model
{ {
get; set; get; set;
} }
public RoleDto? UserRole
{
get; set;
}
} }
} }