From c5cae80b64b4c56601835f4d40e204a462563094 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期二, 29 八月 2023 16:56:38 +0800
Subject: [PATCH] 修正登录逻辑 取消租户登录选项，修正消息租户会自动创建一个员工账号，一企业账号
---
DocumentServiceApi.InitQMessage/MessageReceive.cs | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/DocumentServiceApi.InitQMessage/MessageReceive.cs b/DocumentServiceApi.InitQMessage/MessageReceive.cs
index 39221e6..f250681 100644
--- a/DocumentServiceApi.InitQMessage/MessageReceive.cs
+++ b/DocumentServiceApi.InitQMessage/MessageReceive.cs
@@ -1,9 +1,11 @@
-锘縰sing DocumentServiceAPI.Model.Oder;
+锘縰sing DocumentServiceAPI.Model.cyDocumentModel;
+using DocumentServiceAPI.Model.Oder;
using DocumentServiceAPI.Model.Permissions;
using DocumentServiceAPI.Model.UserInfoModel;
using Furion;
using Furion.JsonSerialization;
using Furion.Logging.Extensions;
+using Furion.Schedule;
using InitQ.Abstractions;
using InitQ.Attributes;
using Microsoft.Extensions.Options;
@@ -64,7 +66,7 @@
CreatBy = "娑堟伅闃熷垪 InitTenantOder",
CreatTime = DateTime.Now,
Description = obj.Description,
- Name = obj.ITCode,
+ Name = obj.Name??obj.ITCode+"闆嗗洟璐﹀彿",
PsW = obj.ITCode.Substring(obj.ITCode.Length - 4),
@@ -81,12 +83,54 @@
};
+
+ //鏂板缓绉熸埛鍛樺伐
+ Document_EmployeeInfo employeeInfo = new Document_EmployeeInfo()
+ {
+ EmployeeName = "闆嗗洟璐﹀彿",
+ UserName = Tinfo.ItCode,
+ AdviseFlag = 2,
+ UserId = 0,
+ IsWork = 1,
+ UserPassWord = Tinfo.ItCode.Substring(Tinfo.ItCode.Length - 6),
+ Job = "闆嗗洟鐢ㄦ埛",
+ IsLogin = true,
+ LastUpdateName = "娑堟伅闃熷垪 InitTenantOder",
+ LastUpdateTime = DateTime.Now,
+ };
+ EmployeeAtTenant employeeAtTenant = new EmployeeAtTenant()
+ {
+ CreatBy = "娑堟伅闃熷垪 InitTenantOder",
+ CreatTime = DateTime.Now,
+
+ };
+
+ Document_TenderUnit tenderUnit = new Document_TenderUnit()
+ {
+ UnitName = obj.Name ?? "闆嗗洟鍏徃",
+ AdviseFlag = 2,
+ UserId = 0,
+ CreatTime = DateTime.Now.ToString("yyyy MM dd"),
+ LastUpdateName = "娑堟伅闃熷垪 InitTenantOder",
+ LastUpdateTime = DateTime.Now,
+ IsDeled = false,
+ IsEn = true,
+
+
+ };
+
try
{
await _db.AsTenant().BeginTranAsync();
var id= await _db.Insertable(Tinfo).ExecuteReturnIdentityAsync();
+ var eid = await _db.Insertable(employeeInfo).ExecuteReturnIdentityAsync();
permissions.TenantId = id;
+ employeeAtTenant.TenantID = id;
+ employeeAtTenant.EmployeeID = eid;
+ tenderUnit.TenantId = id;
+ await _db.Insertable(tenderUnit).ExecuteCommandAsync();
+ await _db.Insertable(employeeAtTenant).ExecuteCommandAsync();
await _db.Insertable(permissions).ExecuteCommandAsync ();
await _db.Insertable(oder).ExecuteCommandAsync();
await _db.AsTenant().CommitTranAsync();
@@ -102,11 +146,17 @@
}
else
{
+ var Employee = await _db.Queryable<EmployeeAtTenant,Document_EmployeeInfo>((EAT, E) => new JoinQueryInfos(
+
+ JoinType.Left, EAT.EmployeeID == E.EmployeeId
+)).Where((EAT, E) => EAT.TenantID==Tinfo.Id).Select((EAT,E)=>E).FirstAsync();
+
Tinfo.ItCode = obj.ITCode;
Tinfo.UpdataBy = "娑堟伅闃熷垪 InitTenantOder";
Tinfo.UpdataTime = DateTime.Now;
Tinfo.IsDel = false;
Tinfo.IsEn = true;
+
var tp= await _db.Queryable<TenantPermissions>().Where(x=>x.TenantId==Tinfo.Id).FirstAsync();
try
@@ -148,6 +198,14 @@
await _db.Updateable(tp).ExecuteCommandAsync();
}
+ if (obj.ITCode != Employee.UserName)
+ {
+ //濡傛灉鍙戠幇鐢ㄦ埛鍚嶅凡缁忔洿鏀癸紝鍒欒闆嗗洟鍛樺伐鐢ㄦ埛鍚嶈窡闅忔洿鏀�
+ Employee.UserName = obj.ITCode;
+ Employee.LastUpdateName= "娑堟伅闃熷垪 InitTenantOder";
+ Employee.LastUpdateTime = DateTime.Now;
+ await _db.Updateable(Employee).ExecuteCommandAsync();
+ }
await _db.Insertable(oder).ExecuteCommandAsync();
await _db.AsTenant().CommitTranAsync();
--
Gitblit v1.9.1