任务分配

操作列表 条件 去掉 name！= “其他款项”

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1242,7 +1242,6 @@ namespace OASystem.API.Controllers
                 /*
                  * 80: //签证
                  */
-
                 List<Grp_VisaInfo> _VisaInfos = await _groupRepository
                                                       .Query<Grp_VisaInfo>(s => s.DIId == _dto.DiId && s.IsDel == 0)
                                                       .ToListAsync();
@@ -1251,7 +1250,6 @@ namespace OASystem.API.Controllers
                 /*
                  *81: //邀请/公务活动
                  */
-
                 List<Grp_InvitationOfficialActivities> _InvitationOfficialActivities = await _groupRepository
                                                                                              .Query<Grp_InvitationOfficialActivities>(s => s.DiId == _dto.DiId && s.IsDel == 0)
                                                                                              .ToListAsync();
@@ -1259,18 +1257,17 @@ namespace OASystem.API.Controllers
                 /*
                  * 82: //团组客户保险
                  */
+                List<Grp_Customers> _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
                  *  Label = 98 其他款项
                  */
-
                 List<Grp_DecreasePayments> _DecreasePayments = await _groupRepository
                                                                     .Query<Grp_DecreasePayments>(s => s.DiId == _dto.DiId && s.IsDel == 0)
                                                                     .ToListAsync();
                 /*
                  *  Lable = 85 机票预订
                  */
-
                 List<Grp_AirTicketReservations> p_AirTicketReservations = await _groupRepository
                                                                                 .Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0)
                                                                                 .ToListAsync();
@@ -1278,7 +1275,6 @@ namespace OASystem.API.Controllers
                 /*
                  * 98 机票预定
                  */
-
                 List<Grp_AirTicketReservations> _AirTicketReservations = await _groupRepository.Query<Grp_AirTicketReservations>(s => s.DIId == _dto.DiId && s.IsDel == 0).ToListAsync();
 
                 /*
@@ -1288,11 +1284,10 @@ namespace OASystem.API.Controllers
                                                                                 .Query<Fin_PaymentRefundAndOtherMoney>(s => s.DiId == _dto.DiId && s.IsDel == 0)
                                                                                 .ToListAsync();
 
-                List<Grp_Customers> _Customers = await _groupRepository.Query<Grp_Customers>(s => s.DiId == _dto.DiId && s.IsDel == 0) .ToListAsync();
+                
                 /*
                  * 币种信息
                  */
-
                 var currencyItems = await _groupRepository.Query<Sys_SetData>(s => s.STid == 66 && s.IsDel == 0).ToListAsync();
 
                 /*

OASystem/OASystem.Infrastructure/Repositories/Groups/TaskAssignmentRepository.cs

@@ -42,7 +42,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 //任务下拉框
                 List<dynamic> _SetData = new List<dynamic>();
-                List<Sys_SetData> sys_SetData = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.Name != "其他款项" && a.STid == 16).ToList();
+                //List<Sys_SetData> sys_SetData = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.Name != "其他款项" && a.STid == 16).ToList();
+                List<Sys_SetData> sys_SetData = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 16).ToList();
                 foreach (var Item in sys_SetData)
                 {
                     var data = new