From f152067f898dcccb349c124d77e8072195c9dd5c Mon Sep 17 00:00:00 2001
From: anjoy8 <3143422472@qq.com>
Date: Tue, 19 Feb 2019 00:33:35 +0800
Subject: [PATCH] vue.admin : user & role
---
Blog.Core.Model/Models/UserRole.cs | 3 +++
Blog.Core.Model/Models/sysUserInfo.cs | 4 +++-
Blog.Core/Blog.Core.Model.xml | 6 +++---
Blog.Core/Blog.Core.xml | 3 ++-
Blog.Core/Controllers/UserController.cs | 24 +++++++++++++++++++-----
5 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/Blog.Core.Model/Models/UserRole.cs b/Blog.Core.Model/Models/UserRole.cs
index 3abe849..ed4b31c 100644
--- a/Blog.Core.Model/Models/UserRole.cs
+++ b/Blog.Core.Model/Models/UserRole.cs
@@ -19,6 +19,9 @@ namespace Blog.Core.Model.Models
UserId = uid;
RoleId = rid;
CreateTime = DateTime.Now;
+ IsDeleted = false;
+ CreateId = uid;
+ CreateTime = DateTime.Now;
}
diff --git a/Blog.Core.Model/Models/sysUserInfo.cs b/Blog.Core.Model/Models/sysUserInfo.cs
index 106d71a..5478001 100644
--- a/Blog.Core.Model/Models/sysUserInfo.cs
+++ b/Blog.Core.Model/Models/sysUserInfo.cs
@@ -101,7 +101,9 @@ namespace Blog.Core.Model.Models
[SugarColumn(IsIgnore = true)]
- public string RID { get; set; }
+ public int RID { get; set; }
+ [SugarColumn(IsIgnore = true)]
+ public string RoleName { get; set; }
}
}
diff --git a/Blog.Core/Blog.Core.Model.xml b/Blog.Core/Blog.Core.Model.xml
index 010d5b2..5564bf9 100644
--- a/Blog.Core/Blog.Core.Model.xml
+++ b/Blog.Core/Blog.Core.Model.xml
@@ -69,7 +69,7 @@
创建时间
-
+
主键
@@ -616,8 +616,8 @@
登录账号
-
-
+
+
用户跟角色关联表
diff --git a/Blog.Core/Blog.Core.xml b/Blog.Core/Blog.Core.xml
index a233cd2..4f86d08 100644
--- a/Blog.Core/Blog.Core.xml
+++ b/Blog.Core/Blog.Core.xml
@@ -304,12 +304,13 @@
专题类型
-
+
构造函数
+
diff --git a/Blog.Core/Controllers/UserController.cs b/Blog.Core/Controllers/UserController.cs
index 8fe9ea4..2d25513 100644
--- a/Blog.Core/Controllers/UserController.cs
+++ b/Blog.Core/Controllers/UserController.cs
@@ -19,16 +19,19 @@ namespace Blog.Core.Controllers
{
IsysUserInfoServices _sysUserInfoServices;
IUserRoleServices _userRoleServices;
+ IRoleServices _roleServices;
///
/// 构造函数
///
///
///
- public UserController(IsysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices )
+ ///
+ public UserController(IsysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices, IRoleServices roleServices)
{
_sysUserInfoServices = sysUserInfoServices;
_userRoleServices = userRoleServices;
+ _roleServices = roleServices;
}
// GET: api/User
@@ -58,9 +61,11 @@ namespace Blog.Core.Controllers
foreach (var item in sysUserInfos)
{
- if (item!=null)
+ if (item != null)
{
- item.RID =(await _userRoleServices.Query(d => d.UserId == item.uID)).FirstOrDefault()?.RoleId.ObjToString();
+ var userrole = (await _userRoleServices.Query(d => d.UserId == item.uID)).OrderByDescending(d => d.Id).FirstOrDefault();
+ item.RID = (userrole?.RoleId).ObjToInt();
+ item.RoleName = ((await _roleServices.QueryByID(item.RID))?.Name);
}
}
@@ -104,11 +109,11 @@ namespace Blog.Core.Controllers
if (tokenModel != null && tokenModel.Uid > 0)
{
var userinfo = await _sysUserInfoServices.QueryByID(tokenModel.Uid);
- if (userinfo!=null)
+ if (userinfo != null)
{
data.response = userinfo;
data.success = true;
- data.msg = "获取成功";
+ data.msg = "获取成功";
}
}
@@ -140,6 +145,15 @@ namespace Blog.Core.Controllers
var data = new MessageModel();
if (sysUserInfo != null && sysUserInfo.uID > 0)
{
+ if (sysUserInfo.RID > 0)
+ {
+ var usrerole = await _userRoleServices.Query(d => d.UserId == sysUserInfo.uID && d.RoleId == sysUserInfo.RID);
+ if (usrerole.Count==0)
+ {
+ await _userRoleServices.Add(new UserRole(sysUserInfo.uID, sysUserInfo.RID));
+ }
+ }
+
data.success = await _sysUserInfoServices.Update(sysUserInfo);
if (data.success)
{