fix .
This commit is contained in:
@@ -256,9 +256,14 @@ public class WorkGridService : IWorkGridService
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public async Task RemoveAsync(WorkGridUserRemoveRequest request)
|
public async Task RemoveAsync(WorkGridUserRemoveRequest request)
|
||||||
{
|
{
|
||||||
|
var role = _currentUser.GetRole();
|
||||||
|
var specific = (role is "admin" or "tenant-admin" or "WGZGLY") && request.WorkGridCode.HasValue;
|
||||||
var currentUserCode = _currentUser.GetUserClaim(UserClaimConstants.JinkoCode);
|
var currentUserCode = _currentUser.GetUserClaim(UserClaimConstants.JinkoCode);
|
||||||
var myWorkGrid = await _dbContext.Queryable<WorkGridEntity>().Where(x => x.LeaderUserCode == currentUserCode).SingleAsync();
|
|
||||||
myWorkGrid.ThrowIfNull("工作网格尚未配置,请联系管理员");
|
var myWorkGrid = await _dbContext.Queryable<WorkGridEntity>()
|
||||||
|
.WhereIF(specific, x => x.Code == request.WorkGridCode)
|
||||||
|
.WhereIF(specific == false, x => x.LeaderUserCode == currentUserCode)
|
||||||
|
.SingleAsync();
|
||||||
|
|
||||||
var workGridUsers = await _dbContext.Queryable<WorkGridUserEntity>()
|
var workGridUsers = await _dbContext.Queryable<WorkGridUserEntity>()
|
||||||
.Where(x => x.WorkGridCode == myWorkGrid.Code)
|
.Where(x => x.WorkGridCode == myWorkGrid.Code)
|
||||||
|
|||||||
Reference in New Issue
Block a user