From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
index 39e6d69..1c84539 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
@@ -1,6 +1,8 @@
锘縰sing DevExpress.Utils.DragDrop;
using DevExpress.XtraEditors;
+using System.Windows.Controls;
using Yw;
+using Yw.DAL.Basic;
using Yw.Vmo;
using Yw.WinFrmUI;
@@ -12,6 +14,7 @@
{
InitializeComponent();
this.gridView1.SetNormalView(30);
+ // this.gridView2.SetNormalView(30);
this.gridView3.SetNormalView(30);
this.PageTitle.Caption = "鐢ㄦ埛绠＄悊";
this.PageTitle.SvgImageSize = new Size(24, 24);
@@ -36,11 +39,11 @@
{
var overlay = this.ShowOverlay();
- var allBindingList = await BLLFactory<Yw.BLL.User>.Instance.GetByCorpID(0);
+ var allList = await BLLFactory<Yw.BLL.User>.Instance.GetByCorpID(GlobalParas._GlobalParas.CorpID);
_allBindingList = new List<UserViewModel>();
- if (allBindingList != null && allBindingList.Count > 0)
+ if (allList != null && allList.Count > 0)
{
- foreach (var item in allBindingList)
+ foreach (var item in allList)
{
var vm = new UserViewModel(item);
_allBindingList.Add(vm);
@@ -129,14 +132,14 @@
//鏌ョ湅
private void View()
{
- /* var vm = GetCurrentViewModel();
- if (vm == null)
- {
- return;
- }
- var dlg = new ViewAssetsUserDlg();
- dlg.SetBindingData(vm.Vmo);
- dlg.ShowDialog();*/
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ var dlg = new ViewUserDlg();
+ dlg.SetBindingData(vm);
+ dlg.ShowDialog();
}
//涓婄Щ
@@ -425,7 +428,7 @@
{
return;
}
- var userRoleInput = new SetUserRoleInput();
+ var userRoleInput = new SetUserRoleInputVmo();
userRoleInput.UserID = vm.ID;
userRoleInput.RoleIds = new List<long>();
foreach (var item in _userRoleHaveViewModelList)
@@ -485,7 +488,7 @@
/// </summary>
private async void gridView3_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
{
- var vm = GetCurrentViewModel();
+ var vm = this.gridView3.GetCurrentViewModel(_userLoginAccountViewModelList);
if (vm == null)
{
return;
@@ -494,27 +497,25 @@
{
if (XtraMessageBox.Show($"纭閲嶇疆瀵嗙爜鍚�?", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation) != DialogResult.OK)
return;
- var loginAccount = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetByUserID(vm.ID);
+ var userVm = GetCurrentViewModel();
+ var loginAccount = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetByUserID(userVm.ID);
if (loginAccount == null || loginAccount.Count == 0)
return;
var bll = new Yw.BLL.UserLoginAccount();
- if (!await bll.ResetSystemLoginPwd(loginAccount.First().ID))
+ if (!await bll.ResetSystemLoginPwd(vm.ID))
{
XtraMessageBox.Show("閲嶇疆澶辫触锛�");
return;
}
- // var model = bll.GetByID(row.ID);
+ // var model = bll.GetByID(row.UserID);
// row.Reset(model);
this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
XtraMessageBox.Show("閲嶇疆鎴愬姛锛�");
}
if (e.Column == this.colEditPwd)
{
- var loginAccount = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetByUserID(vm.ID);
- if (loginAccount == null || loginAccount.Count == 0)
- return;
var dlg = new UpdatePwdDlg();
- dlg.SetBindingData(loginAccount.First().ID);//涓嶅瑕佷慨鏀�,杩樻槸鍋氭垚鍒楄〃
+ dlg.SetBindingData(vm.ID);
dlg.ShowDialog();
}
}
@@ -527,8 +528,28 @@
}
}
- private void gridView3_RowClick(object sender, DevExpress.XtraGrid.Views.Grid.RowClickEventArgs e)
+ //浣跨敤鐘舵��
+ private void BtnEditStatus_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ var dlg = new SetUseStatusDlg();
+ dlg.SetBindingData((Yw.Model.eUseStatus)vm.UseStatus);
+ dlg.ReloadDataEvent += async (status) =>
+ {
+ var bol = await BLLFactory<Yw.BLL.User>.Instance.UpdateUseStatus(vm.ID, (int)status);
+ if (bol)
+ {
+ vm.UseStatus = (eUseStatus)status;
+ this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
+ return true;
+ }
+ return false;
+ };
+ dlg.ShowDialog();
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3