fix 优化任务生成userNos为空情况
This commit is contained in:
@@ -24,10 +24,14 @@ public class DevicePermissionService : IDevicePermissionService
|
|||||||
{
|
{
|
||||||
await GenerateDeviceTasksAsync(async () =>
|
await GenerateDeviceTasksAsync(async () =>
|
||||||
{
|
{
|
||||||
await _dbContext.Client.Deleteable<DevicePermissionEntity>()
|
|
||||||
.Where(x => x.AssignType == reuqest.AssignType)
|
var p = await _dbContext.Queryable<DevicePermissionEntity>()
|
||||||
.Where(x => x.AssignValue == reuqest.AssignValue)
|
.Where(x => x.AssignType == reuqest.AssignType)
|
||||||
.ExecuteCommandAsync();
|
.Where(x => x.AssignValue == reuqest.AssignValue)
|
||||||
|
.Where(x => x.UniqueType == reuqest.UniqueType)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
await _dbContext.DeleteReallyAsync(p);
|
||||||
|
|
||||||
var devicePermissions = reuqest.Codes.Select(x => new DevicePermissionEntity
|
var devicePermissions = reuqest.Codes.Select(x => new DevicePermissionEntity
|
||||||
{
|
{
|
||||||
@@ -35,6 +39,7 @@ public class DevicePermissionService : IDevicePermissionService
|
|||||||
AssignValue = reuqest.AssignValue,
|
AssignValue = reuqest.AssignValue,
|
||||||
UniqueType = reuqest.UniqueType,
|
UniqueType = reuqest.UniqueType,
|
||||||
UniqueValue = x,
|
UniqueValue = x,
|
||||||
|
|
||||||
}).ToList();
|
}).ToList();
|
||||||
|
|
||||||
await _dbContext.InsertAsync(devicePermissions);
|
await _dbContext.InsertAsync(devicePermissions);
|
||||||
@@ -93,7 +98,12 @@ public class DevicePermissionService : IDevicePermissionService
|
|||||||
|
|
||||||
//获取当前的权限code
|
//获取当前的权限code
|
||||||
var currentDic = new Dictionary<string, List<Guid>>(userNos.Count);
|
var currentDic = new Dictionary<string, List<Guid>>(userNos.Count);
|
||||||
userNos = await GetPermissionUserNosAsync();
|
var nextUserNos = await GetPermissionUserNosAsync();
|
||||||
|
if (nextUserNos.Any())
|
||||||
|
{
|
||||||
|
userNos = nextUserNos;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var userNo in userNos)
|
foreach (var userNo in userNos)
|
||||||
{
|
{
|
||||||
currentDic.TryAdd(userNo, await GetAssignDeviceCodesAsync(userNo));
|
currentDic.TryAdd(userNo, await GetAssignDeviceCodesAsync(userNo));
|
||||||
|
|||||||
Reference in New Issue
Block a user