+1

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2616,6 +2616,8 @@ FROM
           AND AddingWay IN (0, 1, 2)
       ) > 0
 	   {userSql}  
+      AND di.IsBid = 0 
+      AND di.TeamName Not Like '%投标%'
       AND VisitDate Between '{beginDt}' And  '{endDt}'
   ) Temp ");
 
@@ -5039,6 +5041,18 @@ FROM
   Grp_DelegationInfo di
 WHERE
   di.IsDel = 0
+  AND (
+        SELECT
+          CAST(
+            COALESCE(SUM(ItemSumPrice * Rate), 0) AS DECIMAL(12, 2)
+          ) AS GroupSales
+        FROM
+          Fin_ForeignReceivables
+        WHERE
+          IsDel = 0
+          AND di.Id = Diid
+          AND AddingWay IN (0, 1, 2)
+      ) > 0
   AND di.IsBid = 0 
   AND di.TeamDid IN (38, 39, 40, 1048)
   AND di.VisitDate BETWEEN '{0}' AND '{1}'
@@ -5050,7 +5064,7 @@ WHERE
             }
 
             var view = await _sqlSugar.SqlQueryable<StatisticsBRCostView>(sql).ToListAsync();
-            view = view.OrderByDescending(x => x.Id).ToList();
+            view = view.Where(x => !x.GroupName.Contains("投标") && x.RealityAmount > 0).OrderByDescending(x => x.Id).ToList();
             var total = view.Count;
             var toSkip = (_dto.PageIndex - 1) * _dto.PageSize;
             var data = view.Skip(toSkip).Take(_dto.PageSize).ToList();

OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -111,7 +111,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             var infos = await _sqlSugar.Queryable<Res_MediaSuppliers>()
                 .LeftJoin<Sys_Users>((ms, u) => ms.CreateUserId == u.Id)
                 .Where((ms, u) => ms.IsDel == 0)
-                .WhereIF(typeLabel.Count > 0 ,x=> typeLabel.Contains(x.TypeId))
+                .WhereIF(typeLabel.Count > 0 , (ms, u) => typeLabel.Contains(ms.TypeId))
                 .WhereIF(!string.IsNullOrEmpty(search), (ms, u) => ms.UnitName.Contains(search) || ms.Contact.Contains(search) || ms.Tel.Contains(search))
                 .OrderByDescending((ms, u) => ms.CreateTime)
                 .Select((ms, u) => new