NewLife
/
XCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

支持关键字模糊搜索用户和部门

This commit is contained in:
智能大石头 2025-02-07 01:19:05 +08:00
parent c82fb5c5ec
commit ff96344a01
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
XCode/Membership/用户.Biz.cs
View File

@ -283,7 +283,7 @@ public partial class User : LogEntity<User>, IUser, IAuthUser, IIdentity
if (departmentId >= 0) exp &= _.DepartmentID == departmentId;
if (enable != null) exp &= _.Enable == enable.Value;
exp &= _.LastLogin.Between(start, end);
if (!key.IsNullOrEmpty()) exp &= _.Code.StartsWith(key) | _.Name.StartsWith(key) | _.DisplayName.StartsWith(key) | _.Mobile.StartsWith(key) | _.Mail.StartsWith(key);
if (!key.IsNullOrEmpty()) exp &= _.Code.Contains(key) | _.Name.Contains(key) | _.DisplayName.Contains(key) | _.Mobile.Contains(key) | _.Mail.Contains(key);
return FindAll(exp, page);
}
@ -327,10 +327,22 @@ public partial class User : LogEntity<User>, IUser, IAuthUser, IIdentity
if (areaIds != null && areaIds.Length > 0) exp &= _.AreaId.In(areaIds);
if (enable != null) exp &= _.Enable == enable.Value;
exp &= _.LastLogin.Between(start, end);
if (!key.IsNullOrEmpty()) exp &= _.Code.StartsWith(key) | _.Name.StartsWith(key) | _.DisplayName.StartsWith(key) | _.Mobile.StartsWith(key) | _.Mail.StartsWith(key);
if (!key.IsNullOrEmpty()) exp &= _.Code.Contains(key) | _.Name.Contains(key) | _.DisplayName.Contains(key) | _.Mobile.Contains(key) | _.Mail.Contains(key);
return FindAll(exp, page);
}
/// <summary>在租户中搜索</summary>
/// <param name="tencentId"></param>
/// <param name="roleIds"></param>
/// <param name="departmentIds"></param>
/// <param name="areaIds"></param>
/// <param name="enable"></param>
/// <param name="start"></param>
/// <param name="end"></param>
/// <param name="key"></param>
/// <param name="page"></param>
/// <returns></returns>
public static IList<User>? SearchWithTenant(Int32 tencentId, Int32[] roleIds, Int32[] departmentIds, Int32[] areaIds, Boolean? enable, DateTime start, DateTime end, String key, PageParameter page)
{
var exp = TenantUser._.TenantId == tencentId;
@ -348,7 +360,7 @@ public partial class User : LogEntity<User>, IUser, IAuthUser, IIdentity
if (areaIds != null && areaIds.Length > 0) exp &= _.AreaId.In(areaIds);
if (enable != null) exp &= _.Enable == enable.Value;
exp &= _.LastLogin.Between(start, end);
if (!key.IsNullOrEmpty()) exp &= _.Code.StartsWith(key) | _.Name.StartsWith(key) | _.DisplayName.StartsWith(key) | _.Mobile.StartsWith(key) | _.Mail.StartsWith(key);
if (!key.IsNullOrEmpty()) exp &= _.Code.Contains(key) | _.Name.Contains(key) | _.DisplayName.Contains(key) | _.Mobile.Contains(key) | _.Mail.Contains(key);
var sql = $"SELECT User.* FROM User INNER JOIN TenantUser ON User.ID= TenantUser.UserId where {exp} ";

2
XCode/Membership/部门.Biz.cs
View File

@ -247,7 +247,7 @@ public partial class Department : Entity<Department>, ITenantSource
if (parentId >= 0) exp &= _.ParentID == parentId;
if (enable != null) exp &= _.Enable == enable.Value;
if (visible != null) exp &= _.Visible == visible.Value;
if (!key.IsNullOrEmpty()) exp &= _.Code.StartsWith(key) | _.Name.StartsWith(key) | _.FullName.StartsWith(key);
if (!key.IsNullOrEmpty()) exp &= _.Code.Contains(key) | _.Name.Contains(key) | _.FullName.Contains(key);
return FindAll(exp, page);
}