fix isDeleted
This commit is contained in:
@@ -146,7 +146,7 @@ public class WorkGridService : IWorkGridService
|
||||
LeaderUserCode = x.LeaderUserCode,
|
||||
UserName = ga.Name,
|
||||
Remark = x.Remark,
|
||||
UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code).Count()
|
||||
UserCount = SqlFunc.Subqueryable<WorkGridUserEntity>().Where(p => p.WorkGridCode == x.Code && x.IsDeleted == false).Count()
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
}
|
||||
@@ -259,7 +259,7 @@ public class WorkGridService : IWorkGridService
|
||||
var role = _currentUser.GetRole();
|
||||
var specific = (role is "admin" or "tenant-admin" or "WGZGLY") && request.WorkGridCode.HasValue;
|
||||
var currentUserCode = _currentUser.GetUserClaim(UserClaimConstants.JinkoCode);
|
||||
|
||||
|
||||
var myWorkGrid = await _dbContext.Queryable<WorkGridEntity>()
|
||||
.WhereIF(specific, x => x.Code == request.WorkGridCode)
|
||||
.WhereIF(specific == false, x => x.LeaderUserCode == currentUserCode)
|
||||
|
||||
Reference in New Issue
Block a user