Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -4,6 +4,7 @@ using OASystem.Domain;
 using OASystem.Domain.Dtos;
 using OASystem.Domain.Dtos.Financial;
 using OASystem.Domain.Entities.Financial;
+using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Financial;
 using OASystem.Infrastructure.Repositories.System;
 using System;
@@ -379,6 +380,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
 
             var _fee = _mapper.Map<Fin_DailyFeePayment>(dto);
             _fee.CreateUserId = dto.UserId;
+            _fee.GroupId = dto.GroupId;
 
             /*
              * 2024-10-29
@@ -387,10 +389,26 @@ namespace OASystem.Infrastructure.Repositories.Financial
              * 团组费用 默认总经理审核通过
              * 2025-03-25
              * 各部门基础固定费用明细”里的费用数据新增后，默认老张通过 财务手动审核 
+             * 
              */
             var priceTypeInfo = await _sqlSugar.Queryable<Sys_SetData>().FirstAsync(x => x.IsDel == 0 && x.Id == dto.PriceTypeId);
             if (priceTypeInfo != null && (priceTypeInfo.STid == 90 || priceTypeInfo.STid == 104))
             {
+
+                //费用类型为团组费用时 验证groupId
+                if (priceTypeInfo.STid == 104)
+                {
+                    var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(x => x.IsDel == 0 && x.Id == _fee.GroupId);
+                    if (groupInfo == null)
+                    {
+                        _sqlSugar.RollbackTran();
+
+                        result.Msg = $"请选择有效的团组名称!";
+                        return result;
+                    }
+                }
+
+
                 //if (priceTypeInfo.STid == 90)
                 //{
                 //    _fee.FAudit = 1;