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. Release Any CPU FileSystem - D:\24小时发布 + C:\Users\Administrator\Desktop\24bendi FileSystem <_TargetId>Folder