From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 01 八月 2025 11:29:49 +0800
Subject: [PATCH] 修改伸缩杆接口
---
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
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_SystemServices/Sys_UserService.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_SystemServices/Sys_UserService.cs"
index 4de239f..400d8ea 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_SystemServices/Sys_UserService.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_SystemServices/Sys_UserService.cs"
@@ -29,8 +29,11 @@
private readonly IRepository<Dt_Maintenance> _MainServer;
private readonly IRepository<Sys_Role> _RoleServer;
private readonly IRepository<Dt_AuthorizationRecord> _AuthorizatRecServer;
- public Sys_UserService(IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
+ private readonly IRepository<Sys_UserFace> _userFace;
+
+ public Sys_UserService(IRepository<Sys_UserFace> userFace,IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
{
+ _userFace= userFace;
_faceServer = faceServer;
_LoginhsyServer = LoginhsyServer;
_unitOfWorkManage = unitOfWorkManage;
@@ -730,12 +733,27 @@
//{
// 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴�
var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
+ if (user==null)
+ {
+ return WebResponseContent.Instance.Error("娌℃湁鎵惧埌璇ョ敤鎴�");
+ }
var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
- if (user != null && main != null)
+ var face= _userFace.QueryData(x=>x.UserName== account).FirstOrDefault();
+ if (main.MaintenanceStatus == 1)
+ {
+ return WebResponseContent.Instance.Error("璇ョ敤鎴疯繕鍦ㄦ淇腑锛屾棤娉曞垹闄�");
+ }
+ if (face == null)
{
BaseDal.DeleteData(user);
_MainServer.DeleteData(main);
}
+ else
+ {
+ BaseDal.DeleteData(user);
+ _MainServer.DeleteData(main);
+ _userFace.DeleteData(face);
+ }
return WebResponseContent.Instance.OK("鐢ㄦ埛鍒犻櫎鎴愬姛");
//}
//else
@@ -1031,9 +1049,23 @@
return webResponse.Error("娌℃湁鎵惧埌璇ョ敤鎴�");
}
var main = _MainServer.QueryData(x => x.UserAccount == user.UserName).FirstOrDefault();
-
- BaseDal.DeleteData(user);
- _MainServer.DeleteData(main);
+ var face = _userFace.QueryData(x => x.UserName == user.UserName).FirstOrDefault();
+ if (main.MaintenanceStatus == 1)
+ {
+ return WebResponseContent.Instance.Error("璇ョ敤鎴疯繕鍦ㄦ淇腑锛屾棤娉曞垹闄�");
+ }
+ if (face == null)
+ {
+ BaseDal.DeleteData(user);
+ _MainServer.DeleteData(main);
+ }
+ else
+ {
+ BaseDal.DeleteData(user);
+ _MainServer.DeleteData(main);
+ _userFace.DeleteData(face);
+ }
+
}
return webResponse.OK();
--
Gitblit v1.9.3