Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java =================================================================== diff -u -r37841 -r38047 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java (.../DeviceInterfaceManagerImpl.java) (revision 37841) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/deviceinterface/service/DeviceInterfaceManagerImpl.java (.../DeviceInterfaceManagerImpl.java) (revision 38047) @@ -25,13 +25,7 @@ @Override public void saveDeviceInterface(DeviceInterface deviceInterface) { - if(deviceInterface != null - && (StringUtils.isNotBlank(deviceInterface.getParaMatchingMethod()) && - !(DeviceInterface.BELIMED.equals(deviceInterface.getDeviceBrand()) || - DeviceInterface.MATACHANA.equals(deviceInterface.getDeviceBrand()) || - DeviceInterface.XINHUA.equals(deviceInterface.getDeviceBrand()) || - DeviceInterface.MELAG.equals(deviceInterface.getDeviceBrand()) - ))){ + if(deviceInterface != null && StringUtils.isBlank(deviceInterface.getParaMatchingMethod())){ deviceInterface.setParaMatchingMethod(null); } validate(deviceInterface);