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

24Hour/24Hour.csproj.user

@@ -3,6 +3,6 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <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>
 </Project>

24Hour/Controllers/Common/CommonController.cs

@@ -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 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 =>
                 {
                     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>()
-                    .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 =>
                 {
                     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>()
-                    .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 =>
                 {
                     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>()
-                    .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 =>
                 {
                     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>()
-                    .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 =>
                 {
                     var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();

24Hour/Controllers/LoginController.cs

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

24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_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 />
   </PropertyGroup>
 </Project>

24Hour/appsettings.json

@@ -8,7 +8,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "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
   "JwtConfiguration": {

Elight.Entity/SystemModel/App_Sys_UserModel.cs

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