2 Commits 3188d70ceb ... d134b70dc4

Author SHA1 Message Date
  LEIYI d134b70dc4 Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop 1 week ago
  LEIYI ac632a2a87 增强权限验证和草稿信息查询功能 1 week ago

+ 4 - 0
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9201,6 +9201,10 @@ FROM
             mobileInfo.DiId = dto.DiId;
             mobileInfo.Currencys = await EnterExitCostMobileGetCurrencyInit();
             if (eecInfo == null) return Ok(mobileInfo);
+            //验证查看、操作权限
+
+
+
 
             mobileInfo = _mapper.Map<EnterExitCostMobileParentInfoView>(eecInfo);
 

+ 6 - 0
OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostDraftRepository.cs

@@ -89,6 +89,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         return result;
                     }
 
+                    enterExitCostInfoView.ViewUsers = await _sqlSugar
+                        .Queryable<Grp_EnterExitCostDraftPermission>()
+                        .Where(x => x.DraftId == id)
+                        .Select(x => x.UserId)
+                        .ToArrayAsync();
+
 
                     var dayAndCostDraftSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCostDraft gdac
                                                         Left Join Grp_NationalTravelFee ntf On ntf.Id = gdac.NationalTravelFeeId