From a67d8edabef6b6bc6df1cea7bd0e019dc9e64828 Mon Sep 17 00:00:00 2001
From: liujiaqiang <1448951783@qq.com>
Date: Mon, 18 Dec 2023 14:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?Id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 24Hour/Controllers/LoginController.cs                   | 8 ++++++--
 24Hour/Controllers/system/SystemControllerController.cs | 4 +++-
 24Hour/Properties/PublishProfiles/FolderProfile.pubxml  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs
index 8cd810d..da6b438 100644
--- a/24Hour/Controllers/LoginController.cs
+++ b/24Hour/Controllers/LoginController.cs
@@ -103,6 +103,7 @@ namespace _24Hour.Controllers
                 photo = date.photo,
                 duties = date.duties,
                 identity = date.identity,
+                openId = date.wechatId,
                 unitCode = date.unitCode,
                 department = date.department,
                 departmentName = date.departmentName,
@@ -179,7 +180,8 @@ namespace _24Hour.Controllers
                     phone = date.phone,
                     photo = date.photo,
                     duties = date.duties,
-                    identity = date.identity,
+                    identity = date.identity,
+                    openId = date.wechatId,
                     unitCode = date.unitCode,
                     unitname = Unitdate?.unitname,
                     department = date.department,
@@ -289,7 +291,8 @@ namespace _24Hour.Controllers
                     phone = date.phone,
                     photo = date.photo,
                     duties = date.duties,
-                    identity = date.identity,
+                    identity = date.identity,
+                    openId = date.wechatId,
                     usertype = date.usertype,
                     unitCode = date.unitCode,
                     department = date.department,
@@ -666,6 +669,7 @@ namespace _24Hour.Controllers
                     photo = date.photo,
                     duties = date.duties,
                     identity = date.identity,
+                    openId = date.wechatId,
                     usertype = date.usertype,
                     unitCode = date.unitCode,
                     token = tokenString
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index ed68e57..f86afa8 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -122,6 +122,7 @@ namespace _24Hour.Controllers.system
                     q.photo,
                     q.identity,
                     q.createtime,
+                    q.messages,
                     unitname = Unitdata?.unitname,
                     departname = Departdata?.departname,
                     roleId = RoleModel.FirstOrDefault(x => x.userId == q.Id)?.Id,
@@ -289,10 +290,11 @@ namespace _24Hour.Controllers.system
                     model.duties = UserModel.duties;
                     model.phone = UserModel.phone;
                     model.cardId = UserModel.cardId;
+                    model.messages = UserModel.messages;
                 }
 
                 _db.BeginTran();
-                var num = await _db.Updateable(model).UpdateColumns(it => new { it.unitCode, it.department, it.name, it.sex, it.duties, it.phone, it.cardId }).ExecuteCommandAsync();
+                var num = await _db.Updateable(model).UpdateColumns(it => new { it.unitCode, it.department, it.name, it.sex, it.duties, it.phone, it.cardId, it.messages }).ExecuteCommandAsync();
                 //判断角色不等于空进
                 if (!string.IsNullOrEmpty(UserModel.roleId))
                 {
diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml
index 6fdc1cf..d7e0b2d 100644
--- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\24小时发布</PublishUrl>
+    <PublishUrl>C:\Users\Administrator\Desktop\24bendi</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />