From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 01 八月 2025 11:29:49 +0800
Subject: [PATCH] 修改伸缩杆接口
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs"
index 18a79e8..5900c1a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs"
@@ -18,10 +18,13 @@
{
public IRepository<Dt_Loginhsy> Repository => BaseDal;
private readonly IRepository<Sys_User> _user;
+ private readonly IRepository<Sys_UserFace> _userface;
+
- public LoginhsyService(IRepository<Sys_User> user, IRepository<Dt_Loginhsy> BaseDal) : base(BaseDal)
+ public LoginhsyService(IRepository<Sys_UserFace> userface,IRepository<Sys_User> user, IRepository<Dt_Loginhsy> BaseDal) : base(BaseDal)
{
_user = user;
+ _userface = userface;
}
public WebResponseContent LoginRecord(PaginationDTO pagination)
@@ -34,7 +37,8 @@
var main = Db.Queryable<Dt_Loginhsy>();
//妯＄硦鏌ヨ
- var query = sys.InnerJoin<Dt_Loginhsy>((a, b) => a.UserName == b.UserName);
+ var query = sys.InnerJoin<Dt_Loginhsy>((a, b) => a.UserName == b.UserName)
+ .LeftJoin<Sys_UserFace>((a, b, c) => a.User_Id == c.User_Id);
if (!string.IsNullOrEmpty(pagination.searchKeyword))
{
query = query.Where((a, b) =>
@@ -80,15 +84,17 @@
//杩斿洖缁撴灉
- var result = query.Select((a, b) => new
+ var result = query.Select((a, b,c) => new
{
a.User_Id,
a.UserTrueName,
a.Userteam,
a.HeadImageUrl,
+ b.ID,
b.LoginTiem,
b.OutTiem,
b.OpCenten,
+ c.UserFaceImageName,
}).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
return new WebResponseContent
--
Gitblit v1.9.3