From 07d8011732a6c6d98fc55ef68495f014f95280d5 Mon Sep 17 00:00:00 2001
From: qwj <qwjzorro@163.com>
Date: 星期四, 24 八月 2023 10:41:59 +0800
Subject: [PATCH] 方案、财务、设备、技术力量、质检报告、制度流程api
---
DocumentServiceAPI.Application/UserAndLogin/LogInController.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs b/DocumentServiceAPI.Application/UserAndLogin/LogInController.cs
index ddcbf1f..3478ee1 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;
@@ -46,9 +48,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 +76,7 @@
};
}
}
- Parma.TenantId = Tender[0].TenderId;
+
break;
default:
@@ -78,7 +84,7 @@
return new RetLoginVM
{
NeedNext = true,
- Tenders = Tender,
+ Tenants = Tender,
};
@@ -93,7 +99,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 +124,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 +138,7 @@
{
EID = Tender.EmployeeID,
LogInSource = Parma.Form,
- TID = Tender.TenderId,
+ TEID = Tender.TenderId,
UID = Parma.UnitID,
});
return new RetLoginVM
--
Gitblit v1.9.1