+1

OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -2480,7 +2480,7 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
                     #region 团组费用未审核数据
 
                     var groupPaymentData = await _sqlSugar.Queryable<Grp_CreditCardPayment>()
-                        .LeftJoin<Grp_DelegationInfo>((ccp, di) => ccp.Id == di.Id)
+                        .LeftJoin<Grp_DelegationInfo>((ccp, di) => ccp.DIId == di.Id)
                         .Where((ccp, di) => ccp.IsDel == 0 &&
                                             ccp.IsAuditGM == 0 &&
                                             ccp.CreateTime >= currStartDate &&
@@ -2547,6 +2547,7 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
                             fr.CreateTime,
                         })
                         .ToListAsync();
+
                     var groupCollectionGroups = groupCollectionData.GroupBy(x => x.CreateUserId)
                         .Select(g => new
                         {
@@ -2562,9 +2563,9 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
                         msgTips = $"上月累计团组收款共{groupCollectionData.Count}条",
                         Data = groupCollectionGroups,
                     };
+                    
                     #endregion
 
-
                     #region 日付申请未审核数据
                     var dailyPaymentData = await _sqlSugar.Queryable<Fin_DailyFeePayment>()
                                                  .LeftJoin<Sys_Users>((dfp, u) => dfp.CreateUserId == u.Id)
@@ -2606,15 +2607,12 @@ And u.UId = {0} And u.FId = 1 ", dto.UserId);
                     };
                     #endregion
 
-
                     return Ok(JsonView(new { groupCollectionData = groupCollectionData1, dailyPaymentData = dailyPaymentData1 }));
                 }
                 return Ok(JsonView(false,"其余部门消息提示正在开发者中......"));
             }
-
             return Ok(JsonView(false));
         }
-
         #endregion
     }
 }