修改拦截

2023-01-05 15:20:36 +08:00
parent 6fcd163988
commit 225cd8c949
17 changed files with 159 additions and 77 deletions
@@ -48,6 +48,8 @@ namespace IRaCIS.Core.Application.Contracts

        public string RealName { get; set; } = string.Empty;

+
+        public Guid UserTypeId { get; set; } 
        public string UserTypeShortName { get; set; } = string.Empty;
    }

@@ -157,6 +157,7 @@ namespace IRaCIS.Core.Application.Services
                            ConfirmTime = confirm.ConfirmTime,
                            RealName = user.LastName + " / " + user.FirstName,
                            UserName = user.UserName,
+                            UserTypeId = user.UserTypeId,
                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
                        };

@@ -160,6 +160,7 @@ namespace IRaCIS.Core.Application.Services
                                              ConfirmTime = confirm.ConfirmTime,
                                              RealName = trialUser.User.FullName,
                                              UserName = trialUser.User.UserName,
+                                              UserTypeId = trialUser.User.UserTypeId,
                                              UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
                                          };

@@ -190,6 +191,7 @@ namespace IRaCIS.Core.Application.Services
                                        ConfirmTime = confirm.ConfirmTime,
                                        RealName = trialUser.User.FullName,
                                        UserName = trialUser.User.UserName,
+                                        UserTypeId = trialUser.User.UserTypeId,
                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName

                                    };
@@ -296,6 +298,7 @@ namespace IRaCIS.Core.Application.Services
                                    ConfirmTime = confirm.ConfirmTime,
                                    RealName = trialUser.User.FullName,
                                    UserName = trialUser.User.UserName,
+                                    UserTypeId = trialUser.User.UserTypeId,
                                    UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,

                                    FullFilePath = trialDocumentNeedConfirmedUserType.TrialDocument.Path 
@@ -329,6 +332,7 @@ namespace IRaCIS.Core.Application.Services
                                     ConfirmTime = confirm.ConfirmTime,
                                     RealName = trialUser.User.FullName,
                                     UserName = trialUser.User.UserName,
+                                     UserTypeId = trialUser.User.UserTypeId,
                                     UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,

                                     FullFilePath = needConfirmEdUserType.SystemDocument.Path
@@ -336,7 +340,8 @@ namespace IRaCIS.Core.Application.Services

            var unionQuery = trialDocQuery.Union(systemDocQuery)
                .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
-                .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId);
+                .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
+                .WhereIf(querySystemDocument.UserTypeId != null, t => t.UserTypeId == querySystemDocument.UserTypeId);

            var result = await unionQuery.ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);

@@ -539,6 +544,7 @@ namespace IRaCIS.Core.Application.Services
        /// 用户 签名某个文档   可能是系统的，也可能是项目的
        /// </summary>
        /// <returns></returns>
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand)
        {

@@ -14,6 +14,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Filter;

 namespace IRaCIS.Core.Application.Service
 {
@@ -755,7 +756,7 @@ namespace IRaCIS.Core.Application.Service
            return await trialEmailNoticeConfigQueryable.ToListAsync();
        }

-
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput> AddOrUpdateTrialEmailNoticeConfig(TrialEmailNoticeConfigAddOrEdit addOrEditTrialEmailNoticeConfig)
        {
            await TestEmailConfigAsync(addOrEditTrialEmailNoticeConfig);
@@ -822,7 +823,6 @@ namespace IRaCIS.Core.Application.Service

        }

-
        private  async Task TestEmailConfigAsync(TrialEmailNoticeConfigAddOrEdit config)
        {
            var toUserList = await  _repository.Where<TrialUser>(t => t.TrialId == config.TrialId && config.ToUserTypeList.Contains(t.User.UserTypeEnum)).Select(t => new { t.User.EMail, t.User.FullName }).ToListAsync();
@@ -885,7 +885,7 @@ namespace IRaCIS.Core.Application.Service

        }

-
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [HttpDelete("{trialEmailNoticeConfigId:guid}")]
        public async Task<IResponseOutput> DeleteTrialEmailNoticeConfig(Guid trialEmailNoticeConfigId)
        {