签证同事共用签证模块列表

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -4844,7 +4844,7 @@ Group by PriceType ", dto.diId);
                 // 申根国家及其他所有国家￥30元 / 人 / 团；
                 var existsCountry = new string[] { "英国", "加拿大", "美国" };
                 var whereExpression = Expressionable.Create<Grp_VisaInfo, Grp_DelegationInfo, Grp_CreditCardPayment>()
-                    .Or(
+                    .And(
                         (x, a, b) => x.IsDel == 0 && x.CreateUserId == userId && (b.IsAuditGM == 1 || b.IsAuditGM == 3)
                         && a.IsDel == 0 && a.VisitDate > StartDateTime && a.VisitDate < EndDateTime && b.IsDel == 0 && x.IsThird == 0 && x.PassengerType == 974
                     );

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3687,15 +3687,27 @@ namespace OASystem.API.Controllers
 
         public IActionResult QueryGroupModelFile(QueryGroupModelFileDto dto)
         {
+            var expression = Expressionable.Create<Grp_GroupModelFile>()
+                .AndIF(dto.UserId != -1 , x => x.CreateUserId == dto.UserId);
+            var visaIds = _sqlSugar.Queryable<Sys_Users>().Where(x => x.JobPostId == 26).Select(x=>x.Id).ToList();
+
+            if (visaIds.Contains(dto.UserId) && dto.Ctable == 80)
+            {
+                expression = Expressionable.Create<Grp_GroupModelFile>()
+                    .And(x=>visaIds.Contains(x.CreateUserId));
+            }
+
             var dbQuery = _sqlSugar.Queryable<Grp_GroupModelFile>()
                 .Where(x => x.IsDel == 0 && x.Cid == dto.Cid && x.Ctable == dto.Ctable && x.Diid == dto.Diid)
-                .WhereIF(dto.UserId != -1,x=>x.CreateUserId == dto.UserId)
+                .Where(expression.ToExpression())
                 .ToList();
+
             return Ok(JsonView(true, "success", dbQuery.Select(x => new
             {
                 x.FileName,
                 x.Id,
                 Url = AppSettingsHelper.Get("GrpFileBaseUrl") + x.FilePath.Replace(AppSettingsHelper.Get("GrpFileBasePath"), AppSettingsHelper.Get("GrpFileFtpPath")),
+                CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH-mm"),
             })));
         }