+1

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2593,14 +2593,24 @@ FROM
       LEFT JOIN Sys_Users u ON di.JietuanOperator = u.Id
     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
 	   {userSql}  
       AND VisitDate Between '{beginDt}' And  '{endDt}'
   ) Temp ");
 
             RefAsync<int> total = 0;
-            var groupData = await _sqlSugar.SqlQueryable<MarketingSalesGroupList>(sql)
-                .Where(x => x.GroupSales > 0) 
-                .ToPageListAsync(_dto.PageIndex, _dto.PageSize, total);
+            var groupData = await _sqlSugar.SqlQueryable<MarketingSalesGroupList>(sql).ToPageListAsync(_dto.PageIndex, _dto.PageSize, total);
 
             return Ok(JsonView(true, "操作成功!", groupData, total));
         }
@@ -2941,13 +2951,23 @@ FROM
       LEFT JOIN Sys_Users u ON di.JietuanOperator = u.Id
     WHERE
       di.Isdel = 0
+    AND (
+          SELECT
+            CAST(
+              COALESCE(SUM(ItemSumPrice * Rate), 0) AS DECIMAL(12, 2)
+            ) AS GroupSales
+          FROM
+            Fin_ForeignReceivables fr
+          WHERE
+            fr.IsDel = 0
+            AND di.Id = fr.Diid
+            AND AddingWay IN (0, 1, 2)
+        ) > 0 
 	   {userSql} 
       AND VisitDate Between '{beginDt}' And  '{endDt}'
   ) Temp ");
             RefAsync<int> total = 0;
-            var groupData = await _sqlSugar.SqlQueryable<MarketingSalesGroupList>(sql)
-                .Where(x => x.GroupSales > 0)
-                .ToPageListAsync(_dto.PageIndex, _dto.PageSize, total);
+            var groupData = await _sqlSugar.SqlQueryable<MarketingSalesGroupList>(sql).ToPageListAsync(_dto.PageIndex, _dto.PageSize, total);
             #endregion
 
             #region 客户类型、客户等级 统计