This commit is contained in:
2024-11-12 17:40:35 +08:00
parent 25e3f99809
commit 0e38406dd5

View File

@@ -4,6 +4,7 @@ using Dlhis.Basic.Device.Request;
using Dlhis.Basic.Device.Response;
using Dlhis.Basic.Organization.Dto;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Device.Enums;
using Dlhis.Entity.Sys.Entities;
@@ -711,12 +712,6 @@ public class DevicePermissionService : IDevicePermissionService
return new Dictionary<string, List<UserTenantDeviceCodeDto>>();
}
var outsourceCodes = await _dbContext.Queryable<GainfoEntity>()
.Where(x => userNos.Contains(x.No))
.Where(x => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == x.Code).Any())
.Select(x => x.Code)
.ToListAsync();
var enableFactoryPermissions = await _dbContext.Queryable<FactorySettingEntity>().ToListAsync();
var gainfoGroupRelationships = await _dbContext.Queryable<GainfoGroupRelationshipEntity>().Where(x => userNos.Contains(x.UserNo)).ToListAsync();
@@ -737,7 +732,7 @@ public class DevicePermissionService : IDevicePermissionService
Workplace = gainfo.Workplace,
Factory = gainfo.Factory,
DepartmentNo = gainfo.DepartmentNo,
IsOutsource = outsourceCodes.Any(x => x == gainfo.Code),
IsOutsource = gainfo.Type == GainfoUserTypeEnumType.Outsource,
EnableFactoryPermission = enableFactoryPermissions.FirstOrDefault(x => x.TenantId == gainfo.Factory)?.EnableOutsourceDown ?? true
};