fix 权限生成处理
This commit is contained in:
@@ -62,7 +62,6 @@ public class SapBusinessTripService : ISapBusinessTripService
|
||||
.Where(x => (SqlFunc.DateIsSame(x.BeginDate, today) && SqlFunc.DateIsSame(x.BeginDate, today))
|
||||
|| (SqlFunc.DateIsSame(x.BeginDate, yesterday) && SqlFunc.DateIsSame(x.BeginDate, yesterday)))
|
||||
.Where(x => !SqlFunc.IsNullOrEmpty(x.Destination))
|
||||
.Where(x => x.Status == BusinessTripStatusEnumType.Wait)
|
||||
.Where(x => x.Destination == factory)
|
||||
.ToListAsync();
|
||||
|
||||
@@ -96,22 +95,8 @@ public class SapBusinessTripService : ISapBusinessTripService
|
||||
continue;
|
||||
}
|
||||
|
||||
if (yesterdayTripInfo == null)
|
||||
{
|
||||
todayTripInfo.Status = BusinessTripStatusEnumType.Generated;
|
||||
await _dbContext.InsertAsync(new DevicePermissionEntity
|
||||
{
|
||||
AssignType = AssignTypeEnumType.User,
|
||||
AssignValue = gainfo.No,
|
||||
UniqueType = DeviceAssignmentTypeEnumType.Group,
|
||||
UniqueValue = tripGroup.Code,
|
||||
TenantId = factory,
|
||||
Type = tripGroup.Type,
|
||||
IsDeleted = false
|
||||
});
|
||||
await _dbContext.UpdateAsync(todayTripInfo);
|
||||
}
|
||||
|
||||
var beforeResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(new List<string> { gainfo.Code });
|
||||
|
||||
if (yesterdayTripInfo != null)
|
||||
{
|
||||
yesterdayTripInfo.Status = BusinessTripStatusEnumType.Deleted;
|
||||
@@ -127,7 +112,22 @@ public class SapBusinessTripService : ISapBusinessTripService
|
||||
await _dbContext.UpdateAsync(yesterdayTripInfo);
|
||||
}
|
||||
|
||||
var beforeResult = await _devicePermissionApi.GetPermissionUsersInfoAsync(new List<string> { gainfo.Code });
|
||||
if (yesterdayTripInfo == null)
|
||||
{
|
||||
todayTripInfo.Status = BusinessTripStatusEnumType.Generated;
|
||||
await _dbContext.InsertAsync(new DevicePermissionEntity
|
||||
{
|
||||
AssignType = AssignTypeEnumType.User,
|
||||
AssignValue = gainfo.No,
|
||||
UniqueType = DeviceAssignmentTypeEnumType.Group,
|
||||
UniqueValue = tripGroup.Code,
|
||||
TenantId = factory,
|
||||
Type = tripGroup.Type,
|
||||
IsDeleted = false
|
||||
});
|
||||
await _dbContext.UpdateAsync(todayTripInfo);
|
||||
}
|
||||
|
||||
await _devicePermissionApi.RePermissionUsersInfoAsync(beforeResult.Data);
|
||||
}
|
||||
catch (Exception e)
|
||||
|
||||
Reference in New Issue
Block a user