From 34f4cd4d829cea4234bd32d1903ee5bfe6af2a47 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期一, 17 三月 2025 09:47:47 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
index e61555d..3f02adb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.cs
@@ -1,8 +1,6 @@
锘縰sing DevExpress.Utils.DragDrop;
using DevExpress.XtraEditors;
-using System.Windows.Controls;
using Yw;
-using Yw.DAL.Basic;
using Yw.Vmo;
using Yw.WinFrmUI;
@@ -39,11 +37,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(LoginUserInfo.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);
@@ -428,7 +426,7 @@
{
return;
}
- var userRoleInput = new SetUserRoleInput();
+ var userRoleInput = new SetUserRoleInputVmo();
userRoleInput.UserID = vm.ID;
userRoleInput.RoleIds = new List<long>();
foreach (var item in _userRoleHaveViewModelList)
@@ -473,7 +471,7 @@
if (e.Column == this.colAccount)
{
_userLoginAccountViewModelList.Clear();
- var allLoginAccountList = await BLLFactory<Yw.BLL.UserLoginAccountStd>.Instance.GetByUserID(vm.ID);
+ var allLoginAccountList = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetByUserID(vm.ID);
foreach (var item in allLoginAccountList)
{
_userLoginAccountViewModelList.Add(new UserAccountViewModel(item));
@@ -507,18 +505,15 @@
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();
}
}
@@ -543,10 +538,10 @@
dlg.SetBindingData((Yw.Model.eUseStatus)vm.UseStatus);
dlg.ReloadDataEvent += async (status) =>
{
- var bol = await BLLFactory<Yw.BLL.User>.Instance.UpdateUseStatus(vm.ID, (int)status);
+ var bol = await BLLFactory<Yw.BLL.User>.Instance.UpdateUseStatus(vm.ID, status);
if (bol)
{
- vm.UseStatus = (eUseStatus)status;
+ vm.UseStatus = status;
this.gridView1.RefreshRow(this.gridView1.FocusedRowHandle);
return true;
}
--
Gitblit v1.9.3