From 0bc66c82a07c1b46a98ba7007b0a672fec02176e Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 17 六月 2025 17:30:13 +0800
Subject: [PATCH] 修改bug
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs | 4 ++--
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs | 1 +
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 2 +-
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs | 1 +
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs | 5 +++--
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs | 8 +++++---
6 files changed, 13 insertions(+), 8 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_Server/Controllers/Telescopic/MaintenanceController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
index 49807d5..b48fc1f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
@@ -103,7 +103,7 @@
public WebResponseContent StartMaintenceTask(string account)
{
var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
- var reslut = userIp.Replace("::ffff:", "");
+ var reslut = userIp.Replace("::ffff:","");
return Service.StartMaintenceTask(account, userIp);
}
@@ -117,7 +117,7 @@
public WebResponseContent StopMaintenanceTask(string account)
{
var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
- var reslut = userIp.Replace("::ffff:", "");
+ var reslut = userIp.Replace("::ffff:","");
return Service.StopMaintenanceTask(account, userIp);
}
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..b00bc31 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"
@@ -86,6 +86,7 @@
a.UserTrueName,
a.Userteam,
a.HeadImageUrl,
+ b.ID,
b.LoginTiem,
b.OutTiem,
b.OpCenten,
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/MaintenanceService.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/MaintenanceService.cs"
index f714a20..9a78cf8 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/MaintenanceService.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/MaintenanceService.cs"
@@ -630,8 +630,8 @@
//{
// return new WebResponseContent { Status = false, Message = "鎿嶄綔璁惧涓嶅悓锛岃鍥炲埌鍘熸湰璁惧鍐嶇偣鍑荤粨鏉熸淇�" };
//}
- var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 ""
+ var address = _ipaddress.QueryData(x => x.IPaddress == ip).FirstOrDefault();
var addressIp = "";
if (address != null) //鎵惧埌浜�
{
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/MaintenanceTeamService.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/MaintenanceTeamService.cs"
index 04f4732..510ff6e 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/MaintenanceTeamService.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/MaintenanceTeamService.cs"
@@ -75,14 +75,14 @@
//"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),
- _ => query.OrderByDescending((a, b) => b.Creater), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
+ _ => query.OrderByDescending((a, b) => b.CreateDate), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
};
}
else
{
//榛樿鎸夊垱寤烘椂闂撮檷搴忔帓搴�
- query = query.OrderByDescending((a, b) => b.Creater);
+ query = query.OrderByDescending((a, b) => b.CreateDate);
}
//// 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
@@ -107,12 +107,14 @@
var result=query
.Select((a, b) => new
{
- a.User_Id,
+
+ //a.User_Id,
a.Dept_Id,//杞ㄩ亾绔�
a.IsLeader,//鏄惁鏄彮闀�
a.Role_Id,
a.RoleName,//瑙掕壊鍚嶇О
a.Unit,//鍗曚綅
+ b.ID,
b.IPAddress,//鐢佃剳ip鍦板潃
b.OperatorName,//濮撳悕
b.TeamName,//鐝粍
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/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/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs"
index e2edc32..41ffa04 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/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/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/LoginhsyService.cs"
@@ -84,6 +84,7 @@
a.UserTrueName,
a.Userteam,
a.HeadImageUrl,
+ b.ID,
b.LoginTiem,
b.OutTiem,
b.OpCenten,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
index 2a6fd12..c32991e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
@@ -72,14 +72,14 @@
//"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),
- _ => query.OrderByDescending((a, b) => b.Creater), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
+ _ => query.OrderByDescending((a, b) => b.CreateDate), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
};
}
else
{
//榛樿鎸夊垱寤烘椂闂撮檷搴忔帓搴�
- query = query.OrderByDescending((a, b) => b.Creater);
+ query = query.OrderByDescending((a, b) => b.CreateDate);
}
//// 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
@@ -104,6 +104,7 @@
var result = query
.Select((a, b) => new
{
+ b.ID,
a.User_Id,
a.Dept_Id,//杞ㄩ亾绔�
a.IsLeader,//鏄惁鏄彮闀�
--
Gitblit v1.9.3