动态下拉框更改2

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -205,10 +205,9 @@
         a.*
         FROM
         device_analog_variable_list AS a
-        JOIN device AS b ON a.communication_equipment = b.id
+        left JOIN device AS b ON a.communication_equipment = b.id
         <where>
             a.status = 1
-            AND b.enable = 1
             <if test="dataArea != null and dataArea != 0">
             AND a.data_area = #{dataArea}
             </if>

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -249,7 +249,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     @Override
     public List<DeviceAnalogVariableList> dynamicPropertiesDroplist(Integer siteId, Integer dataArea) {
         List<DeviceAnalogVariableList> deviceAnalogVariableList = new ArrayList<>();
-        if (siteId==0){
+        if (siteId!=0){
             deviceAnalogVariableList = baseMapper.deviceAnalogVariableList(siteId,dataArea);
         }
         return deviceAnalogVariableList;