diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
index 7896312..bcc6647 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
@@ -6,7 +6,6 @@ using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
-
namespace ZR.Admin.WebApi.Controllers.System
{
///
@@ -79,21 +78,20 @@ namespace ZR.Admin.WebApi.Controllers.System
///
/// 添加用户
///
- ///
+ ///
///
- [HttpPost("edit")]
+ [HttpPost("add")]
[Log(Title = "用户管理", BusinessType = BusinessType.INSERT)]
[ActionPermissionFilter(Permission = "system:user:add")]
- public IActionResult AddUser([FromBody] SysUser user)
+ public IActionResult AddUser([FromBody] SysUserDto parm)
{
+ var user = parm.Adapt().ToCreate(HttpContext);
if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
if (UserConstants.NOT_UNIQUE.Equals(UserService.CheckUserNameUnique(user.UserName)))
{
return ToResponse(ApiResult.Error($"新增用户 '{user.UserName}'失败,登录账号已存在"));
}
- user.Create_by = HttpContext.GetName();
- user.Create_time = DateTime.Now;
user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password);
return SUCCESS(UserService.InsertUser(user));
@@ -102,16 +100,16 @@ namespace ZR.Admin.WebApi.Controllers.System
///
/// 修改用户
///
- ///
+ ///
///
[HttpPut("edit")]
[Log(Title = "用户管理", BusinessType = BusinessType.UPDATE)]
[ActionPermissionFilter(Permission = "system:user:edit")]
- public IActionResult UpdateUser([FromBody] SysUser user)
+ public IActionResult UpdateUser([FromBody] SysUserDto parm)
{
+ var user = parm.Adapt().ToUpdate(HttpContext);
if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
- user.Update_by = HttpContext.GetName();
int upResult = UserService.UpdateUser(user);
return ToResponse(upResult);
diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs
index 01fa179..97f3309 100644
--- a/ZR.Repository/BaseRepository.cs
+++ b/ZR.Repository/BaseRepository.cs
@@ -146,8 +146,8 @@ namespace ZR.Repository
}
catch (Exception ex)
{
+ Console.WriteLine("事务异常" + ex.Message);
client.AsTenant().RollbackTran();
- Console.WriteLine(ex.Message);
throw;
}
}
diff --git a/ZR.ServiceCore/Model/Dto/SysUserDto.cs b/ZR.ServiceCore/Model/Dto/SysUserDto.cs
index 9d07520..0dd2422 100644
--- a/ZR.ServiceCore/Model/Dto/SysUserDto.cs
+++ b/ZR.ServiceCore/Model/Dto/SysUserDto.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.Model.System.Dto
{
public class SysUserDto
{
@@ -15,6 +13,29 @@ namespace ZR.Model.System.Dto
///
public int Sex { get; set; }
public string Password { get; set; }
+
+ ///
+ /// 帐号状态(0正常 1停用)
+ ///
+ public int Status { get; set; }
+
+ ///
+ /// 最后登录IP
+ ///
+ public string LoginIP { get; set; }
+
+ ///
+ /// 部门Id
+ ///
+ public long DeptId { get; set; }
+ ///
+ /// 角色id集合
+ ///
+ public long[] RoleIds { get; set; }
+ ///
+ /// 岗位集合
+ ///
+ public int[] PostIds { get; set; }
}
public class SysUserQueryDto
diff --git a/ZR.ServiceCore/Services/SysUserRoleService.cs b/ZR.ServiceCore/Services/SysUserRoleService.cs
index 2c567b5..c61b18e 100644
--- a/ZR.ServiceCore/Services/SysUserRoleService.cs
+++ b/ZR.ServiceCore/Services/SysUserRoleService.cs
@@ -107,6 +107,7 @@ namespace ZR.ServiceCore.Services
///
public int InsertUserRole(SysUser user)
{
+ //if(user.RoleIds == null) return 0;
List userRoles = new();
foreach (var item in user.RoleIds)
{
diff --git a/ZR.ServiceCore/Services/SysUserService.cs b/ZR.ServiceCore/Services/SysUserService.cs
index 5555d9c..4dd270e 100644
--- a/ZR.ServiceCore/Services/SysUserService.cs
+++ b/ZR.ServiceCore/Services/SysUserService.cs
@@ -102,11 +102,18 @@ namespace ZR.ServiceCore.Services
///
public SysUser InsertUser(SysUser sysUser)
{
- sysUser.UserId = Insertable(sysUser).ExecuteReturnIdentity();
- //新增用户角色信息
- UserRoleService.InsertUserRole(sysUser);
- //新增用户岗位信息
- UserPostService.InsertUserPost(sysUser);
+ var result = UseTran(() =>
+ {
+ sysUser.UserId = Insertable(sysUser).ExecuteReturnIdentity();
+ //新增用户角色信息
+ UserRoleService.InsertUserRole(sysUser);
+ //新增用户岗位信息
+ UserPostService.InsertUserPost(sysUser);
+ });
+ if (!result.IsSuccess)
+ {
+ throw new Exception("提交数据异常," + result.ErrorMessage, result.ErrorException);
+ }
return sysUser;
}
diff --git a/ZR.Vue/src/api/system/user.js b/ZR.Vue/src/api/system/user.js
index b87809b..7058625 100644
--- a/ZR.Vue/src/api/system/user.js
+++ b/ZR.Vue/src/api/system/user.js
@@ -22,7 +22,7 @@ export function getUser(userId) {
// 新增用户
export function addUser(data) {
return request({
- url: '/system/user/edit',
+ url: '/system/user/add',
method: 'post',
data: data,
})