用户登录信息新增查询界限limits,案件管理查询新增查询界限条件

src/1.datas/ATS.NonCustodial.Domain/Entities/Admins/AppUser.cs

@@ -166,5 +166,11 @@ namespace ATS.NonCustodial.Domain.Entities.Admins
         /// </summary>
         [MaxLength(StringLengthConstants.StringLength255)]
         public string? CId { get; set; }
+
+        /// <summary>
+        /// 查询界限
+        /// </summary>
+        [MaxLength(StringLengthConstants.StringLength2048)]
+        public string? limits { get; set; }
     }
 }

src/1.datas/ATS.NonCustodial.Domain/Entities/Business/CaseManagements/AppCaseSupervisor.cs

@@ -38,5 +38,7 @@ namespace ATS.NonCustodial.Domain.Entities.Business.CaseManagements
         /// </summary>
         [MaxLength(StringLengthConstants.StringLength20)]
         public string? SupervisorName { get; set; }
+
+        public long UnitId { get; set; }
     }
 }

src/2.services/ATS.NonCustodial.Application/Impl/Admins/AuthService.cs

@@ -413,7 +413,7 @@ namespace ATS.NonCustodial.Application.Impl.Admins
                 new Claim(ClaimAttributes.orgs,JsonConvert.SerializeObject(Array.Empty<long>())) ,
                 new Claim(ClaimAttributes.phone,user?.Phone??""),
                 new Claim(ClaimAttributes.logtime,timeLogin),
-
+                new Claim(ClaimAttributes.limits,user?.limits??""),
                 new Claim(ClaimAttributes.personType,user?.ChatPersonType.ToString()!)
             });
 

src/2.services/ATS.NonCustodial.Application/Impl/Admins/UserService.cs

@@ -12,6 +12,7 @@ using ATS.NonCustodial.Domain.Shared.OrmRepositories.Basic.EfCore;
 using ATS.NonCustodial.DynamicApi;
 using ATS.NonCustodial.DynamicApi.Attributes;
 using ATS.NonCustodial.Shared.Common.Attributes;
+using ATS.NonCustodial.Shared.Common.Auth;
 using ATS.NonCustodial.Shared.Common.Constants;
 using ATS.NonCustodial.Shared.Common.Dtos;
 using ATS.NonCustodial.Shared.Common.Dtos.Query;

src/2.services/ATS.NonCustodial.Application/Impl/Business/CaseManagements/AppCaseManagementService.cs

@@ -16,6 +16,7 @@ using ATS.NonCustodial.Domain.Shared.Enums;
 using ATS.NonCustodial.Domain.Shared.OrmRepositories.Basic.EfCore;
 using ATS.NonCustodial.DynamicApi;
 using ATS.NonCustodial.DynamicApi.Attributes;
+using ATS.NonCustodial.Shared.Common.Auth;
 using ATS.NonCustodial.Shared.Common.Dtos;
 using ATS.NonCustodial.Shared.Common.Enums;
 using ATS.NonCustodial.Shared.Common.UnifiedResults;
@@ -140,24 +141,45 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
         [HttpPost]
         public async Task<IResultOutput> GetPageAsync(AppCaseManagementGetPageInput input)
         {
+            var limits = User.limits;
+            var selectLimits = await _appCaseSupervisorRepository.AsQueryable(false, true)
+                .Where(w => limits.Contains(w.UnitId.ToString()))
+                .ToListAsync();
+            input.CaseIds= selectLimits.Select(w => w.CaseId).Distinct().ToList();
+
             var express = await GetExpression(input, _appCaseManagementRepository.AsQueryable(false, true));
 
             var rtn = await base.GetPageAsync<AppCaseManagement, AppCaseManagementGetPageInput, AppCaseManagementListDto>(input, express);
 
-            var caseIds = rtn.Data.Select(w => w.Id).ToList();
-
-            var caseSupervisor = await _appCaseSupervisorRepository.AsQueryable(false, true)
-                .Where(w => caseIds.Contains(w.CaseId))
-                .ToListAsync();
-
             foreach (var listDto in rtn.Data)
             {
-                listDto.Supervisor = caseSupervisor.Where(w => w.CaseId == listDto.Id).Select(w => w.SupervisorName).JoinAsString(",");
+                listDto.Supervisor = selectLimits.Where(w => w.CaseId == listDto.Id).Select(w => w.SupervisorName).JoinAsString(",");
             }
 
             return ResultOutput.Ok(rtn);
         }
 
+        //[HttpPost]
+        //public async Task<IResultOutput> GetPageAsync(AppCaseManagementGetPageInput input)
+        //{
+        //    var express = await GetExpression(input, _appCaseManagementRepository.AsQueryable(false, true));
+
+        //    var rtn = await base.GetPageAsync<AppCaseManagement, AppCaseManagementGetPageInput, AppCaseManagementListDto>(input, express);
+
+        //    var caseIds = rtn.Data.Select(w => w.Id).ToList();
+
+        //    var caseSupervisor = await _appCaseSupervisorRepository.AsQueryable(false, true)
+        //        .Where(w => caseIds.Contains(w.CaseId))
+        //        .ToListAsync();
+
+        //    foreach (var listDto in rtn.Data)
+        //    {
+        //        listDto.Supervisor = caseSupervisor.Where(w => w.CaseId == listDto.Id).Select(w => w.SupervisorName).JoinAsString(",");
+        //    }
+
+        //    return ResultOutput.Ok(rtn);
+        //}
+
         /// <summary>
         /// 案件统计
         /// </summary>
@@ -1429,6 +1451,7 @@ namespace ATS.NonCustodial.Application.Impl.Business.CaseManagements
             var caseIds = await (await base.GetCurrentUserCaseListAsync()).Select(w => w.AppCaseManagement.Id).ToListAsync();
 
             query = query
+                .WhereIf(pageInput.CaseIds.IsNotNullOrEmpty(), w => pageInput.CaseIds.Contains(w.Id))
                 .WhereIf(pageInput.CaseName.NotNull(), a => a.Name.Contains(pageInput.CaseName))
                 .WhereIf(pageInput.CaseTypeId != null, a => a.CaseTypeId == pageInput.CaseTypeId)
                 .WhereIf(pageInput.JudgmentStatusIds.IsNotNullOrEmpty(), w => pageInput.JudgmentStatusIds.Contains(w.JudgmentStatusId))

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Admins/Auth/Output/AuthLoginOutput.cs

@@ -1,4 +1,6 @@
-using ATS.NonCustodial.Shared.Common.Enums;
+using ATS.NonCustodial.Domain.Shared.Constants;
+using ATS.NonCustodial.Shared.Common.Enums;
+using System.ComponentModel.DataAnnotations;
 
 namespace ATS.NonCustodial.Application.Contracts.Interfaces.Admins.Auth.Output
 {
@@ -73,5 +75,10 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Admins.Auth.Output
         /// 手机登录获取到得手机唯一标识，（用于个推）
         /// </summary>
         public string? CId { get; set; }
+
+        /// <summary>
+        /// 查询界限
+        /// </summary>
+        public string? limits { get; set; }
     }
 }

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/AppCaseManagements/AppCaseManagement/Input/AppCaseManagementGetPageInput.cs

@@ -29,5 +29,7 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppCaseMana
         /// 案件类型（数据来自字典）
         /// </summary>
         public long? CaseTypeId { get; set; }
+
+        public List<long>? CaseIds { get; set; }
     }
 }

src/3.contracts/ATS.NonCustodial.Application.Contracts/Interfaces/Business/AppCaseManagements/AppCaseManagement/Output/AppCaseManagementListDto.cs

@@ -62,7 +62,7 @@ namespace ATS.NonCustodial.Application.Contracts.Interfaces.Business.AppCaseMana
         /// <summary>
         /// 案子开始时间
         /// </summary>
-        public DateTime CaseBeginTime { get; set; }
+        public DateTime? CaseBeginTime { get; set; }
 
         /// <summary>
         /// 案子结束时间

src/4.apps/ATS.NonCustodial.Admin.Api/Seeds/initData/app_dictionary.json

@@ -17940,12 +17940,5 @@
     "value": "50,100",
     "description": "预警 50 次变黄，预警 100 次变红",
     "id": 688380702408773
-  },
-  {
-    "dictionaryTypeId": 299412358086725,
-    "name": "脱离区域申请",
-    "code": "LeaveAreaApplication",
-    "description": "",
-    "id": 718135330779205
   }
 ]

src/4.apps/ATS.NonCustodial.Admin.Api/Seeds/initData/app_user_role.json

@@ -3033,5 +3033,20 @@
     "userId": 713086111326277,
     "roleId": 297606179328069,
     "id": 713086111330373
+  },
+  {
+    "userId": 718152871231557,
+    "roleId": 297606179008581,
+    "id": 718153020973125
+  },
+  {
+    "userId": 718153091203141,
+    "roleId": 297606179008581,
+    "id": 718153214885957
+  },
+  {
+    "userId": 718153428750405,
+    "roleId": 297606179008581,
+    "id": 718153634299973
   }
 ]

src/5.shared/ATS.NonCustodial.Admin.Jobs/Jobs/PunchRecordJob.cs

@@ -45,7 +45,7 @@ namespace ATS.NonCustodial.Admin.QuartzJobs.Jobs
         {
             ConsoleHelper.WriteWarningLine("job start……");
 
-            await _appPunchRecordService.CheckPunchRecordForJob();
+            //await _appPunchRecordService.CheckPunchRecordForJob();
 
             ConsoleHelper.WriteWarningLine("job end……");
         }

src/5.shared/ATS.NonCustodial.Shared/Common/Auth/ClaimAttributes.cs

@@ -1,4 +1,6 @@
-namespace ATS.NonCustodial.Shared.Common.Auth
+using System.ComponentModel.DataAnnotations;
+
+namespace ATS.NonCustodial.Shared.Common.Auth
 {
     /// <summary>
     /// Claim属性
@@ -83,5 +85,11 @@
         /// 职位类型转换为枚举
         /// </summary>
         public const string personType = "persontype";
+
+
+        /// <summary>
+        /// 查询界限
+        /// </summary>
+        public const string limits = "limits";
     }
 }

src/5.shared/ATS.NonCustodial.Shared/Common/Auth/IUser.cs

@@ -1,4 +1,5 @@
 using ATS.NonCustodial.Shared.Common.Enums;
+using System.ComponentModel.DataAnnotations;
 using System.Security.Claims;
 
 namespace ATS.NonCustodial.Shared.Common.Auth
@@ -50,6 +51,12 @@ namespace ATS.NonCustodial.Shared.Common.Auth
         /// </summary>
         string NickName { get; }
 
+
+        /// <summary>
+        /// 查询界限
+        /// </summary>
+        string limits { get; }
+
         /// <summary>
         /// 租户Id
         /// </summary>

src/5.shared/ATS.NonCustodial.Shared/Common/Auth/User.cs

@@ -158,6 +158,24 @@ namespace ATS.NonCustodial.Shared.Common.Auth
             }
         }
 
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        public string limits
+        {
+            get
+            {
+                var name = _accessor?.HttpContext?.User?.FindFirst(ClaimAttributes.limits);
+
+                if (name != null && name.Value.NotNull())
+                {
+                    return name.Value;
+                }
+
+                return "";
+            }
+        }
+
         /// <summary>
         /// 租户Id
         /// </summary>