diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ce481e0..ce3338f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -93,7 +93,6 @@ a.DEVICE_TYPE AS "deptType", a.INSTALL_HEIGHT AS "installHeight", b.TYPE_NAME AS "deviceTypeName", - d.DEPTID FROM bus_device a INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID @@ -104,7 +103,11 @@ and a.device_Type = #{deviceType} - and not EXISTS (SELECT 1 FROM bus_config WHERE bus_config.DEVICE_ID = a.ID) + and not EXISTS ( + SELECT 1 FROM bus_config + WHERE bus_config.DEVICE_ID = a.ID + AND STATUS='0' + ) ORDER by a.DEVCODE