LEIYI 4 months ago
parent
commit
ab778e5f58

+ 2 - 1
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -2845,9 +2845,10 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                     x.Price,
                     x.Currency,
                     x.Files,
-                    x.Remark
+                    x.Remark,
                 })
                 .FirstAsync();
+            
 
             return Ok(JsonView(view));
         }

+ 1 - 3
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2278,7 +2278,6 @@ ORDER BY
         /// <summary>
         ///  市场部销售额
         ///  年度/季度/月度 报表(同比)
-        ///  (增加团组查询条件 IsSure=1)
         /// </summary>
         /// <param name="_dto">市场部销售额请求dto</param>
         /// <returns></returns>
@@ -3522,7 +3521,6 @@ FROM
 WHERE
   di.IsDel = 0
   AND di.TeamDid IN (38,39,40,1048)
-  AND di.IsSure = 1
   AND di.VisitDate BETWEEN '{0}' AND '{1}'
 ORDER BY
   di.VisitDate
@@ -3956,7 +3954,7 @@ WHERE
 
             var groupInfos = await _sqlSugar.Queryable<Grp_DelegationInfo>()
                                             .Where(x => x.IsDel == 0)
-                                            .Where(x => x.IsSure == 1)
+                                            //.Where(x => x.IsSure == 1)
                                             .Where(x => x.VisitDate >= _beginDt && x.VisitDate <= _endDt)
                                             .ToListAsync();