冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 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();
            }
        }