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 | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
index 30c2fa8..1c84539 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
@@ -39,11 +39,11 @@
{
var overlay = this.ShowOverlay();
- var allBindingList = await BLLFactory<Yw.BLL.User>.Instance.GetByCorpID(GlobalParas._GlobalParas.CorpID);
+ 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);
@@ -514,11 +514,8 @@
}
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();
}
}
--
Gitblit v1.9.3