From a3b1d7bfe497ca5ece2a51eb15a5534a98b33dcb Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 16 六月 2025 17:28:41 +0800
Subject: [PATCH] 1
---
项目代码/后端/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 18 ++++++++++--------
1 files changed, 10 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_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 29f169b..f714a20 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"
@@ -235,11 +235,12 @@
{
// 1. 鏌ユ壘鐩爣鐢ㄦ埛锛堣琚己鍒朵笅绾跨殑浜猴級
var maint = BaseDal.QueryData().FirstOrDefault(x => x.ID == id);
- var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user琛�
- if (maint == null || sysuer==null)
+ if (maint==null)
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
+ var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user琛�
+
// 2. 鏌ユ壘褰撳墠鐧诲綍鐢ㄦ埛锛堟墽琛屾搷浣滅殑浜猴級
@@ -262,7 +263,7 @@
maint.MaintenanceStatus = 0; // 鏀瑰彉鐘舵�佷负涓嬬嚎
BaseDal.UpdateData(maint);
- var ip = LocalIP.Replace("::ffff:", "");
+ var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 ""
// 5. 璁板綍鎿嶄綔鏃ュ織
var recording = new Dt_MaintenanceTeam
@@ -539,7 +540,8 @@
}
}
- var ip = LocalIP.Replace("::ffff:", "");
+
+ var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 ""
//濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
@@ -561,7 +563,7 @@
Account = account,
MaintenanceStatus=1,
OperatorName = sysuer.UserTrueName,
- TeamName = sysuer.RoleName,
+ TeamName = sysuer.Userteam,
DistributionTime = DateTime.Now,
IPAddress = addressIp,
};
@@ -619,7 +621,7 @@
return new WebResponseContent
{
Status = false,
- Message = "鎮ㄦ槸鏈�鍚庝竴涓湪鍦虹殑缁勯暱锛岃绛夊緟鎵�鏈夌粍鍛樺畬鎴愭淇悗鍐嶇粨鏉�"
+ Message = "鎮ㄦ槸鏈�鍚庝竴涓湪鍦虹殑涓�绾т汉鍛橈紝璇风瓑寰呮墍鏈変簩绾т汉鍛樺畬鎴愭淇悗鍐嶇粨鏉�"
};
}
}
@@ -629,7 +631,7 @@
// return new WebResponseContent { Status = false, Message = "鎿嶄綔璁惧涓嶅悓锛岃鍥炲埌鍘熸湰璁惧鍐嶇偣鍑荤粨鏉熸淇�" };
//}
var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
- var ip = LocalIP.Replace("::ffff:", "");
+ var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // 濡傛灉 LocalIP 鏄� null锛宨p 浼氭槸 ""
var addressIp = "";
if (address != null) //鎵惧埌浜�
{
@@ -651,7 +653,7 @@
Account = account,
MaintenanceStatus = 0,
OperatorName = sysuer.UserTrueName,
- TeamName = sysuer.RoleName,
+ TeamName = sysuer.Userteam,
IPAddress = addressIp,
EndTime = DateTime.Now,
};
--
Gitblit v1.9.3