Merge branch 'feature/bug-1286' into develop
This commit is contained in:
commit
3fb86a4565
|
|
@ -656,7 +656,7 @@ public class DeviceController extends ControllerBase {
|
||||||
device.setServiceAgentCode("");
|
device.setServiceAgentCode("");
|
||||||
device.setServiceAgentName("");
|
device.setServiceAgentName("");
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(device.getId()) && StrUtil.equals(device.getServiceAgentName(),oldServiceAgentName)){
|
if (Objects.nonNull(device.getId()) && !StrUtil.equals(device.getServiceAgentName(),oldServiceAgentName)){
|
||||||
deviceAgentRecords.add(new DeviceAgentRecord()
|
deviceAgentRecords.add(new DeviceAgentRecord()
|
||||||
.setDeviceId(device.getId())
|
.setDeviceId(device.getId())
|
||||||
.setAgentCode(device.getServiceAgentCode())
|
.setAgentCode(device.getServiceAgentCode())
|
||||||
|
|
|
||||||
|
|
@ -679,7 +679,7 @@ public class DeviceController extends ControllerBase {
|
||||||
device.setServiceAgentCode("");
|
device.setServiceAgentCode("");
|
||||||
device.setServiceAgentName("");
|
device.setServiceAgentName("");
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(device.getId()) && StrUtil.equals(device.getServiceAgentName(),oldServiceAgentName)){
|
if (Objects.nonNull(device.getId()) && !StrUtil.equals(device.getServiceAgentName(),oldServiceAgentName)){
|
||||||
deviceAgentRecords.add(new GongfuDeviceAgentRecord()
|
deviceAgentRecords.add(new GongfuDeviceAgentRecord()
|
||||||
.setDeviceId(device.getId())
|
.setDeviceId(device.getId())
|
||||||
.setAgentCode(device.getServiceAgentCode())
|
.setAgentCode(device.getServiceAgentCode())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue