g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-31 15:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

导入变量时写入机构id

Browse Source
This commit is contained in:
Diego
2024-11-06 10:18:52 +08:00
parent 95afcedc4f
commit 2b07097e14
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gateway/ThingsGateway.Gateway.Application/Services/Channel/ChannelService.cs
View File

@@ -445,6 +445,8 @@ internal class ChannelService : BaseService<Channel>, IChannelService
{
channel.Id = CommonUtils.GetSingleId();
channel.IsUp = false;
channel.CreateOrgId = UserManager.OrgId;
channel.CreateUserId = UserManager.UserId;
}
if (channel.IsUp && ((dataScope != null && dataScope?.Count > 0 && !dataScope.Contains(channel.CreateOrgId)) || dataScope?.Count == 0 && channel.CreateUserId != UserManager.UserId))

2
src/Gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
View File

@@ -726,6 +726,8 @@ internal class DeviceService : BaseService<Device>, IDeviceService
{
device.Id = CommonUtils.GetSingleId();
device.IsUp = false;
device.CreateOrgId = UserManager.OrgId;
device.CreateUserId = UserManager.UserId;
}
// 将设备添加到设备列表中，并添加成功信息到导入预览结果

2
src/Gateway/ThingsGateway.Gateway.Application/Services/Variable/VariableService.cs
View File

@@ -669,6 +669,8 @@ internal class VariableService : BaseService<Variable>, IVariableService
else
{
variable.IsUp = false;
variable.CreateOrgId = UserManager.OrgId;
variable.CreateUserId = UserManager.UserId;
}
if (device.IsUp && ((dataScope != null && dataScope?.Count > 0 && !dataScope.Contains(variable.CreateOrgId)) || dataScope?.Count == 0 && variable.CreateUserId != UserManager.UserId))