From 54dc2cb5136a74acaa669c336751bb828434f5a5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 02 四月 2025 19:34:11 +0800
Subject: [PATCH] 111
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index 2f18d6d..77d601d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -482,11 +482,13 @@
var result = query.Select((a, b) => new
{
- a.UserPwd,
+
+
a.Log_id,
a.User_Id,
a.UserName,
a.UserTrueName,
+ a.UserPwd,
a.PhoneNo,
a.Role_Id,
a.RoleName,
@@ -555,7 +557,7 @@
UserName = addUserDTO.username,
UserTrueName=addUserDTO.usertruename,
HeadImageUrl=addUserDTO.path,
- Log_id = face,
+ Log_id = baiduResult.log_id,
Face_token = baiduResult.result.face_token,
PhoneNo = addUserDTO.phoneno,
Role_Id = addUserDTO.roleid,
@@ -602,7 +604,6 @@
user_id = addUserDTO.username,
group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍
});
-
// 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛
if (baiduResult == null || baiduResult.error_code != 0)
{
@@ -610,25 +611,21 @@
}
// 鑾峰彇鏇存柊鍚庣殑 Face_token
faceToken = baiduResult.result.face_token;
+
+ // 鏇存柊鏌ヨ鍒扮殑鐢ㄦ埛鏁版嵁
+ sys.UserName = addUserDTO.username;
+ sys.UserTrueName = addUserDTO.usertruename;
+ sys.HeadImageUrl = addUserDTO.path; // 鏇存柊澶村儚璺緞锛堝鏋滄湁鏂拌矾寰勶級
+ sys.Log_id = baiduResult.log_id;
+ //濡傛灉 faceToken 涓嶆槸 null锛屽氨鎶� faceToken 璧嬪�肩粰 sys.Face_token锛涘惁鍒欙紝淇濇寔 sys.Face_token 鐨勫師鍊间笉鍙樸��
+ sys.Face_token = faceToken ?? sys.Face_token;
+ sys.PhoneNo = addUserDTO.phoneno;
+ sys.Role_Id = addUserDTO.roleid;
+ sys.RoleName = addUserDTO.rolename;
+ sys.Enable = addUserDTO.enable;
+ // 鏇存柊鏁版嵁搴�
+ BaseDal.UpdateData(sys);
}
-
- // 鏌ヨ鐜版湁鐢ㄦ埛
-
-
- // 鏇存柊鏌ヨ鍒扮殑鐢ㄦ埛鏁版嵁
- sys.UserName = addUserDTO.username;
- sys.UserTrueName = addUserDTO.usertruename;
- sys.HeadImageUrl = addUserDTO.path; // 鏇存柊澶村儚璺緞锛堝鏋滄湁鏂拌矾寰勶級
- sys.Log_id = face;
- //sys.Face_token = faceToken ?? addUserDTO.face_token; // 濡傛灉娌℃湁鏇存柊鍥剧墖锛屼繚鎸佸師鏈� Face_token
- sys.Face_token = faceToken; // 濡傛灉娌℃湁鏇存柊鍥剧墖锛屼繚鎸佸師鏈� Face_token
- sys.PhoneNo = addUserDTO.phoneno;
- sys.Role_Id = addUserDTO.roleid;
- sys.RoleName = addUserDTO.rolename;
- sys.Enable = addUserDTO.enable;
-
- // 鏇存柊鏁版嵁搴�
- BaseDal.UpdateData(sys);
return new WebResponseContent { Status = true, Data = sys };
}
--
Gitblit v1.9.3