diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java index 3a6bf99a..25c11c44 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java @@ -660,9 +660,14 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { if (channel.getChannelType() != 2) { // 业务分组/虚拟组织/行政区划 不设置以下属性 catalogXml.append("" + channel.getModel() + "\r\n") - .append(" " + channel.getOwner()+ "\r\n") - .append("" + channel.getCivilCode() + "\r\n") - .append("
" + channel.getAddress() + "
\r\n"); + .append(" " + channel.getOwner()+ "\r\n"); + if (channel.getCivilCode() != null) { + catalogXml.append("" + channel.getCivilCode() + "\r\n"); + }else { + catalogXml.append("" + parentPlatform.getAdministrativeDivision() + "\r\n"); + } + + catalogXml.append("
" + channel.getAddress() + "
\r\n"); catalogXml.append("" + channel.getLongitude() + "\r\n"); catalogXml.append("" + channel.getLatitude() + "\r\n"); }