From 54dc2cb5136a74acaa669c336751bb828434f5a5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 02 四月 2025 19:34:11 +0800
Subject: [PATCH] 111

---
 /dev/null                                                                         |    0 
 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg      |    0 
 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/wwwroot/image/微信图片_20250402172104.jpg |    0 
 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs            |   39 ++++++++++++++++++---------------------
 4 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_Server/wwwroot/image/1743555123354.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555123354.png"
deleted file mode 100644
index 2e7403a..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555123354.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555145885.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555145885.png"
deleted file mode 100644
index ebef766..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555145885.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555260571.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555260571.png"
deleted file mode 100644
index ea48144..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555260571.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555310550.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555310550.png"
deleted file mode 100644
index 7782dda..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555310550.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555372954.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555372954.png"
deleted file mode 100644
index 1138fe6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555372954.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555395910.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555395910.png"
deleted file mode 100644
index 2754914..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743555395910.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743562028103.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743562028103.png"
deleted file mode 100644
index 9bd0d9b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743562028103.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575983021.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575983021.png"
deleted file mode 100644
index 9bd0d9b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575983021.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575985033.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575985033.png"
deleted file mode 100644
index ab3b7ea..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575985033.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575987026.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575987026.png"
deleted file mode 100644
index aebd6a3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575987026.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575989030.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575989030.png"
deleted file mode 100644
index b803030..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575989030.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575991033.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575991033.png"
deleted file mode 100644
index 8f7c822..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575991033.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575993033.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575993033.png"
deleted file mode 100644
index e963a6c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575993033.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575995036.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575995036.png"
deleted file mode 100644
index e6fb049..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575995036.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575997026.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575997026.png"
deleted file mode 100644
index c9d3b64..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575997026.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575999035.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575999035.png"
deleted file mode 100644
index 7183ed2..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743575999035.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576001036.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576001036.png"
deleted file mode 100644
index dac1ec3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576001036.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576003026.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576003026.png"
deleted file mode 100644
index 9929f26..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576003026.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576005027.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576005027.png"
deleted file mode 100644
index 2ec77b7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576005027.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576007027.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576007027.png"
deleted file mode 100644
index 2dee351..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576007027.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576009033.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576009033.png"
deleted file mode 100644
index fdf896d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576009033.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576011032.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576011032.png"
deleted file mode 100644
index f603e4d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576011032.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576013029.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576013029.png"
deleted file mode 100644
index ce95a9c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576013029.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576015030.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576015030.png"
deleted file mode 100644
index e1d678d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576015030.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576017025.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576017025.png"
deleted file mode 100644
index e76b8df..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/1743576017025.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg"
new file mode 100644
index 0000000..837cc73
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg"
new file mode 100644
index 0000000..837cc73
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg"
Binary files differ
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