From b4f4b640ac62bf583e25512656ac92bb09872b8a Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期五, 04 八月 2023 09:38:10 +0800
Subject: [PATCH] 增加用户详情，
---
DocumentServiceAPI.Application/UserAndLogin/LogInController.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs b/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs
index ddcbf1f..af4662b 100644
--- a/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs
+++ b/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs
@@ -3,6 +3,7 @@
using DocumentServiceAPI.Utility;
using Furion.DynamicApiController;
using Furion.JsonSerialization;
+using Swashbuckle.AspNetCore.Annotations;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -16,6 +17,7 @@
/// </summary>
[ApiDescriptionSettings("LogInAndUser")]
[DynamicApiController]
+
public class LogInController
{
private TokenService _tokenService;
@@ -29,6 +31,8 @@
/// </summary>
/// <returns>鐧诲綍淇℃伅</returns>
[HttpPost("LogoIn")]
+
+
public async Task<RetLoginVM> LogoIn (LoginPsWordIN Parma)
{
bool needtoken=false;
@@ -46,9 +50,13 @@
if(!needtoken)
throw Oops.Oh($"璐︽埛鎴栬�呭瘑鐮侀敊璇�");
+
+ Parma.TenantId = Tender[0].TenderId;
+ Parma.employeeID = Tender[0].EmployeeID;
if (Parma.UnitID == null)
{
- var Units = await _userService.GetUserUnitInfo(Parma.TenantId ?? 0);
+
+ List<UnitVM> Units = await _userService.GetUserUnitList(Parma.TenantId ?? 0);
if (Units.Count == 0)
{
//娌℃湁鍏徃
@@ -70,7 +78,7 @@
};
}
}
- Parma.TenantId = Tender[0].TenderId;
+
break;
default:
@@ -78,7 +86,7 @@
return new RetLoginVM
{
NeedNext = true,
- Tenders = Tender,
+ Tenants = Tender,
};
@@ -93,7 +101,7 @@
else if(Parma.UnitID==null)
{
- var Units = await _userService.GetUserUnitInfo(Parma.TenantId??0);
+ var Units = await _userService.GetUserUnitList(Parma.TenantId??0);
if(Units.Count==0)
{
//娌℃湁鍏徃
@@ -118,6 +126,7 @@
if(needtoken|| Parma.UnitID!=null)
{
+
TenderVM Tender = (await _userService.GetUserTenderList(Parma.ITCode)).Where(x=>x.TenderId==Parma.TenantId&&x.EmployeeID==Parma.employeeID).SingleOrDefault();
if(Tender==null)
{
@@ -131,7 +140,7 @@
{
EID = Tender.EmployeeID,
LogInSource = Parma.Form,
- TID = Tender.TenderId,
+ TEID = Tender.TenderId,
UID = Parma.UnitID,
});
return new RetLoginVM
--
Gitblit v1.9.1