From 8492d1f2b6f9b8184d05207a6007a4bcc10fd2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 1 Mar 2022 16:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=88=B6=E5=AE=9A=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Repository/System/SysUserRepository.cs | 31 +++++++++++------------
ZR.Vue/src/views/system/user/index.vue | 19 +++++++++-----
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/ZR.Repository/System/SysUserRepository.cs b/ZR.Repository/System/SysUserRepository.cs
index bb3d1b9..1128be6 100644
--- a/ZR.Repository/System/SysUserRepository.cs
+++ b/ZR.Repository/System/SysUserRepository.cs
@@ -111,7 +111,7 @@ namespace ZR.Repository.System
}
///
- /// 删除用户
+ /// 删除用户(物理删除)
///
/// 用户id
///
@@ -125,26 +125,25 @@ namespace ZR.Repository.System
///
/// 修改用户信息
///
- ///
+ ///
///
public int UpdateUser(SysUser user)
{
return Context.Updateable(user)
- //.SetColumns(t => new SysUser()
- //{
- // UserName = user.UserName,
- // Status = user.Status,
- // NickName = user.NickName,
- // Remark = user.Remark,
- // Email = user.Email,
- // Update_by = user.Update_by,
- // Phonenumber = user.Phonenumber,
- // Update_time = DateTime.Now,
- // Sex = user.Sex,
- // DeptId = user.DeptId
- //})
+ .UpdateColumns(t => new
+ {
+ t.NickName,
+ t.Email,
+ t.Phonenumber,
+ t.DeptId,
+ t.Status,
+ t.Sex,
+ t.PostIds,
+ t.Remark,
+ t.Update_by,
+ t.Update_time
+ })
.IgnoreColumns(ignoreAllNullColumns: true)//忽略所有为null
- .IgnoreColumns(it => new { it.Password, it.Avatar })
.Where(f => f.UserId == user.UserId).ExecuteCommand();
}
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index 05605b9..0f4352d 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -60,9 +60,9 @@
-
-
-
+
+
+
@@ -82,10 +82,12 @@
{{ parseTime(scope.row.createTime) }}
+
+
-
+
修改
- 删除
重置
@@ -304,6 +306,8 @@ export default {
// { key: 6, label: `创建时间`, checked: true },
{ key: 0, label: `登录IP`, checked: false },
{ key: 1, label: `最后登录时间`, checked: false },
+ { key: 2, label: `创建人`, checked: false },
+ { key: 3, label: `备注`, checked: false },
],
// 表单校验
rules: {
@@ -463,6 +467,10 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
+ if(row.userId !== 1 | row.userName != 'admin'){
+ this.msgError("不能对管理进行修改")
+ return;
+ }
this.reset();
this.getTreeselect();
const userId = row.userId || this.ids;
@@ -488,7 +496,6 @@ export default {
this.open = true;
this.title = "修改用户";
- console.log(this.form.roleIds);
});
},
/** 重置密码按钮操作 */