linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加用户登录返回部门名称

master
林杨 2 years ago
parent
d3c642ad2b
commit
d3e61568ad
6 changed files with 40 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      24Hour/24Hour.csproj.user
  2. 10
      24Hour/Controllers/Common/CommonController.cs
  3. 21
      24Hour/Controllers/LoginController.cs
  4. 2
      24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
  5. 2
      24Hour/appsettings.json
  6. 15
      Elight.Entity/SystemModel/App_Sys_UserModel.cs

2
24Hour/24Hour.csproj.user
Unescape View File

@ -3,6 +3,6 @@
<PropertyGroup> <PropertyGroup>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>E:\Code\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

10
24Hour/Controllers/Common/CommonController.cs
Unescape View File

@ -836,7 +836,7 @@ namespace _24Hour.Controllers.Common
var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); var Userdata = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync();
//获取律师服务预约记录 //获取律师服务预约记录
var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>() var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Lawyerdata.ToList().ForEach(q => Lawyerdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -872,7 +872,7 @@ namespace _24Hour.Controllers.Common
}); });
//获取远程会见预约记录 //获取远程会见预约记录
var Remotedata = await _db.Queryable<App_RemoteModel>() var Remotedata = await _db.Queryable<App_RemoteModel>()
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Remotedata.ToList().ForEach(q => Remotedata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -909,7 +909,7 @@ namespace _24Hour.Controllers.Common
}); });
//获取远程接待预约记录 //获取远程接待预约记录
var Receptiondata = await _db.Queryable<App_ReceptionModel>() var Receptiondata = await _db.Queryable<App_ReceptionModel>()
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Receptiondata.ToList().ForEach(q => Receptiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -946,7 +946,7 @@ namespace _24Hour.Controllers.Common
}); });
//获取认罪认罚预约记录 //获取认罪认罚预约记录
var Confessiondata = await _db.Queryable<App_ConfessionModel>() var Confessiondata = await _db.Queryable<App_ConfessionModel>()
.Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Confessiondata.ToList().ForEach(q => Confessiondata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
@ -983,7 +983,7 @@ namespace _24Hour.Controllers.Common
}); });
//获取听证服务预约记录 //获取听证服务预约记录
var Hearingdata = await _db.Queryable<App_HearingModel>() var Hearingdata = await _db.Queryable<App_HearingModel>()
.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
Hearingdata.ToList().ForEach(q => Hearingdata.ToList().ForEach(q =>
{ {
var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();

21
24Hour/Controllers/LoginController.cs
Unescape View File

@ -68,6 +68,14 @@ namespace _24Hour.Controllers
ret.Message = "账号或者密码错误！"; ret.Message = "账号或者密码错误！";
return ret; return ret;
} }
if (!string.IsNullOrEmpty(date.department))
{
var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id== date.department && x.IsDelete==0).FirstAsync();
if (dept!= null)
{
date.departmentName= dept.departname;
}
}
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
@ -101,6 +109,7 @@ namespace _24Hour.Controllers
identity = date.identity, identity = date.identity,
unitCode = date.unitCode, unitCode = date.unitCode,
department = date.department, department = date.department,
departmentName = date.departmentName,
token = tokenString token = tokenString
}; };
#endregion #endregion
@ -158,6 +167,14 @@ namespace _24Hour.Controllers
ret.Message = $"账号未授权无法登录，请联系管理员！"; ret.Message = $"账号未授权无法登录，请联系管理员！";
return ret; return ret;
} }
if (!string.IsNullOrEmpty(date.department))
{
var dept = await _db.Queryable<App_Sys_DepartModel>().Where(x => x.Id== date.department && x.IsDelete==0).FirstAsync();
if (dept!= null)
{
date.departmentName= dept.departname;
}
}
#region jwt生成token #region jwt生成token
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var claims = new Claim[] var claims = new Claim[]
@ -189,7 +206,8 @@ namespace _24Hour.Controllers
identity = date.identity, identity = date.identity,
usertype = date.usertype, usertype = date.usertype,
unitCode = date.unitCode, unitCode = date.unitCode,
department = "", department = date.department,
departmentName = date.departmentName,
token = tokenString token = tokenString
}; };
#endregion #endregion
@ -302,6 +320,7 @@ namespace _24Hour.Controllers
UserModel.usertype = 1; UserModel.usertype = 1;
//默认密码 //默认密码
UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower(); UserModel.Password = Elight.Utility.Encrypt.Md5.Encrypt32($"{UserModel.Password}").ToLower();
var num = await _db.Insertable(UserModel).ExecuteCommandAsync(); var num = await _db.Insertable(UserModel).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)

2
24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl> <_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl>
<History>True|2023-06-30T10:44:10.1995292Z;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History> <History>True|2023-06-30T12:53:10.2775714Z;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
24Hour/appsettings.json
Unescape View File

@ -8,7 +8,7 @@
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"DBType": "MySQL", "DBType": "MySQL",
"MySQLConnString": "server=192.168.0.251;Database=equipmentrearend;Uid=root;Pwd=sa@admin;Allow User Variables=True;" "MySQLConnString": "server=192.168.0.251;Database=equipmentrearend;Uid=root;Pwd=sa@admin;Allow User Variables=True;SslMode=none;AllowPublicKeyRetrieval=True;"
}, },
//JwtConfig //JwtConfig
"JwtConfiguration": { "JwtConfiguration": {

15
Elight.Entity/SystemModel/App_Sys_UserModel.cs
Unescape View File

@ -27,15 +27,20 @@ namespace Elight.Entity
public string? unitCode { get; set; } public string? unitCode { get; set; }
/// <summary> /// <summary>
/// 部门 /// 部门id
/// </summary> /// </summary>
[DataMember] [DataMember]
public string? department { get; set; } public string? department { get; set; }
/// <summary> /// <summary>
/// 密码 /// 部门
/// </summary> /// </summary>
[DataMember] [DataMember]
public string? departmentName { get; set; }
/// <summary>
/// 密码
/// </summary>
[DataMember]
public string? Password { get; set; } public string? Password { get; set; }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save