Browse Source

用户修改接口调整,登录接口需要展示微信Id字段

develop
liujiaqiang 2 years ago
parent
commit
a67d8edabe
  1. 8
      24Hour/Controllers/LoginController.cs
  2. 4
      24Hour/Controllers/system/SystemControllerController.cs
  3. 2
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml

8
24Hour/Controllers/LoginController.cs

@ -103,6 +103,7 @@ namespace _24Hour.Controllers
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity = date.identity, identity = date.identity,
openId = date.wechatId,
unitCode = date.unitCode, unitCode = date.unitCode,
department = date.department, department = date.department,
departmentName = date.departmentName, departmentName = date.departmentName,
@ -179,7 +180,8 @@ namespace _24Hour.Controllers
phone = date.phone, phone = date.phone,
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity = date.identity, identity = date.identity,
openId = date.wechatId,
unitCode = date.unitCode, unitCode = date.unitCode,
unitname = Unitdate?.unitname, unitname = Unitdate?.unitname,
department = date.department, department = date.department,
@ -289,7 +291,8 @@ namespace _24Hour.Controllers
phone = date.phone, phone = date.phone,
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity = date.identity, identity = date.identity,
openId = date.wechatId,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
department = date.department, department = date.department,
@ -666,6 +669,7 @@ namespace _24Hour.Controllers
photo = date.photo, photo = date.photo,
duties = date.duties, duties = date.duties,
identity = date.identity, identity = date.identity,
openId = date.wechatId,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
token = tokenString token = tokenString

4
24Hour/Controllers/system/SystemControllerController.cs

@ -122,6 +122,7 @@ namespace _24Hour.Controllers.system
q.photo, q.photo,
q.identity, q.identity,
q.createtime, q.createtime,
q.messages,
unitname = Unitdata?.unitname, unitname = Unitdata?.unitname,
departname = Departdata?.departname, departname = Departdata?.departname,
roleId = RoleModel.FirstOrDefault(x => x.userId == q.Id)?.Id, roleId = RoleModel.FirstOrDefault(x => x.userId == q.Id)?.Id,
@ -289,10 +290,11 @@ namespace _24Hour.Controllers.system
model.duties = UserModel.duties; model.duties = UserModel.duties;
model.phone = UserModel.phone; model.phone = UserModel.phone;
model.cardId = UserModel.cardId; model.cardId = UserModel.cardId;
model.messages = UserModel.messages;
} }
_db.BeginTran(); _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)) if (!string.IsNullOrEmpty(UserModel.roleId))
{ {

2
24Hour/Properties/PublishProfiles/FolderProfile.pubxml

@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider> <PublishProvider>FileSystem</PublishProvider>
<PublishUrl>D:\24小时发布</PublishUrl> <PublishUrl>C:\Users\Administrator\Desktop\24bendi</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />

Loading…
Cancel
Save