HC_YFZX
/
Infrastructure
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Insight' of http://123.132.248.154:10000/HC_YFZX/Infrastructure into Insight

Insight
continue 2024-11-20 08:50:17 +08:00
parent cacf4ff730 12f43f0d84
commit 912313716a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.App/ServiceApp/DataAnalysisApp.cs
View File

@ -207,6 +207,7 @@ namespace OpenAuth.App.ServiceApp
.LeftJoin<SysUser>((a, b) => a.ReciveUserId == b.Id.ToString())
.WhereIF(beginTime.Year != 0001, a => a.CreateTime >= beginTime && a.CreateTime <= endTime)
.WhereIF(groupUser.Count > 0, a => groupUser.Contains(a.ReciveUserId))
.Where((a,b)=>!string.IsNullOrEmpty(a.ReciveUserId))
.GroupBy((a, b) => b.Name)
.Select((a, b) => new UserOrGroupTaskResp
{
@ -228,6 +229,7 @@ namespace OpenAuth.App.ServiceApp
.LeftJoin<SysGroup>((a, b, c) => b.GroupId == c.Id)
.WhereIF(beginTime.Year != 0001, a => a.CreateTime >= beginTime && a.CreateTime <= endTime)
.WhereIF(groupUser.Count > 0, a => groupUser.Contains(a.ReciveUserId))
.Where((a, b) => !string.IsNullOrEmpty(a.ReciveUserId))
.GroupBy((a, b, c) => c.Name)
.Select((a, b, c) => new UserOrGroupTaskResp
{