Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-05-30 09:30:38 +08:00
parent c759d1bccb f5f0de7716
commit ea7b5579d1
4 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Repository/System/SysUserRoleRepository.cs
View File

@@ -1,4 +1,5 @@
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using System.Collections.Generic;
using ZR.Model;
@@ -102,12 +103,9 @@ namespace ZR.Repository.System
{
var query = Context.Queryable<SysUser>()
.Where(it => it.DelFlag == "0")
.Where(it => SqlFunc.Subqueryable<SysUserRole>()
.Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny());
if (!string.IsNullOrEmpty(roleUserQueryDto.UserName))
{
query = query.Where(x => x.UserName.Contains(roleUserQueryDto.UserName));
}
.Where(it => SqlFunc.Subqueryable<SysUserRole>().Where(s => s.UserId == it.UserId && s.RoleId == roleUserQueryDto.RoleId).NotAny())
.WhereIF(roleUserQueryDto.UserName.IsNotEmpty(), it => it.UserName.Contains(roleUserQueryDto.UserName));
return query.ToPage(roleUserQueryDto);
}
}