.
This commit is contained in:
@@ -136,7 +136,7 @@ public class DevicePermissionsController : ControllerBase
|
||||
|
||||
[HttpPost("temp-userPermissionCodes")]
|
||||
[IgnoreTenant]
|
||||
public async Task<object> GetAssignDeviceCodesAsync(List<string> userCodes)
|
||||
public async Task<List<TempC>> GetAssignDeviceCodesAsync(List<string> userCodes)
|
||||
{
|
||||
return await _devicePermissionService.GetUserDeviceCodesByNoAsync(userCodes);
|
||||
}
|
||||
|
||||
@@ -64,5 +64,5 @@ public interface IDevicePermissionService : IScopeDependency
|
||||
|
||||
Task<int> GenerateDeleteDeviceTasksAsync(string deviceUniqueNo);
|
||||
|
||||
Task<object> GetUserDeviceCodesByNoAsync(List<string> userCodes);
|
||||
Task<List<TempC>> GetUserDeviceCodesByNoAsync(List<string> userCodes);
|
||||
}
|
||||
@@ -342,7 +342,7 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
return deviceCodes.Concat(manuallyDeviceCodes).Distinct().ToList();
|
||||
}
|
||||
|
||||
public async Task<object> GetUserDeviceCodesByNoAsync(List<string> userCodes)
|
||||
public async Task<List<TempC>> GetUserDeviceCodesByNoAsync(List<string> userCodes)
|
||||
{
|
||||
var users = await _dbContext.Queryable<GainfoEntity>().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.No, x.Code, x.Name }).ToListAsync();
|
||||
var userNos = users.Select(x => x.No).ToList();
|
||||
@@ -364,13 +364,19 @@ public class DevicePermissionService : IDevicePermissionService
|
||||
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
|
||||
|
||||
var finialResult = new List<object>();
|
||||
var finialResult = new List<TempC>();
|
||||
foreach (var item in userWithDeviceCodes)
|
||||
{
|
||||
var userNo = item.Key;
|
||||
var user = users.First(x => x.No == userNo);
|
||||
|
||||
var details = devices.Where(x => item.Value.Contains(x.Code)).Select(x => new { UserCode = user.Code, UserName = user.Name, DeviceUniqueNo = x.UniqueNo, DeviceDeployPlace = x.DeployPlace });
|
||||
var details = devices.Where(x => item.Value.Contains(x.Code)).Select(x => new TempC
|
||||
{
|
||||
UserCode = user.Code,
|
||||
UserName = user.Name,
|
||||
DeviceUniqueNo = x.UniqueNo,
|
||||
DeviceDeployPlace = x.DeployPlace
|
||||
});
|
||||
finialResult.AddRange(details);
|
||||
}
|
||||
|
||||
|
||||
16
Src/Dlhis.Basic/TempC.cs
Normal file
16
Src/Dlhis.Basic/TempC.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
namespace Dlhis.Basic
|
||||
{
|
||||
public class TempC
|
||||
{
|
||||
//UserCode = user.Code,
|
||||
// UserName = user.Name,
|
||||
// DeviceUniqueNo = x.UniqueNo,
|
||||
// DeviceDeployPlace = x.DeployPlace
|
||||
|
||||
public string UserCode { get; set; }
|
||||
public string UserName { get; set; }
|
||||
|
||||
public string DeviceUniqueNo { get; set; }
|
||||
public string DeviceDeployPlace { get; set; }
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user