diff --git a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java b/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java
index 63fca76..fe808f8 100644
--- a/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java
+++ b/psdc-business/src/main/java/com/psdc/mapper/SysDeviceHeatSceneMapper.java
@@ -28,6 +28,6 @@ public interface SysDeviceHeatSceneMapper {
      * @param types 设备细类
      * @return
      */
-    List<SysDeviceHeatScene> selDevicesBySubType(@Param(value = "types") String types);
+    List<SysDeviceHeatScene> selDevicesBySubType(@Param(value = "types") List<String> types);
 
 }
diff --git a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java b/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java
index e9e5125..047d788 100644
--- a/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java
+++ b/psdc-business/src/main/java/com/psdc/service/model/IBuildHeatingService.java
@@ -20,7 +20,7 @@ public interface IBuildHeatingService {
 
     List selAllDevices();
 
-    List<SysDeviceHeatScene> selDevicesBySubType(String types);
+    List<SysDeviceHeatScene> selDevicesBySubType(List<String> types);
 
 
 }
diff --git a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java
index bd9e656..e657cd1 100644
--- a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java
+++ b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java
@@ -61,8 +61,9 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService {
     }
 
     @Override
-    public List<SysDeviceHeatScene> selDevicesBySubType(String types) {
-        return deviceHeatSceneMapper.selDevicesBySubType(types);
+    public List<SysDeviceHeatScene> selDevicesBySubType(List<String> types) {
+        List<SysDeviceHeatScene> scenes = deviceHeatSceneMapper.selDevicesBySubType(types);
+        return scenes;
     }
 
 }
diff --git a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml
index 4ba1a74..bd3ce44 100644
--- a/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/SysDeviceHeatSceneMapper.xml
@@ -29,6 +29,9 @@
     </select>
 
     <select id="selDevicesBySubType" resultMap="SysDeviceHeatSceneMap">
-        Select * From sys_device_heat_scene where dev_sub_type In (#{types})
+        Select * From sys_device_heat_scene where dev_sub_type In
+        <foreach collection="types" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java
index 4d4882b..dc62aba 100644
--- a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java
@@ -7,7 +7,9 @@ import com.psdc.service.model.IBuildHeatingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,17 +50,25 @@ public class BuildHeatingController {
         AjaxResult ajax = AjaxResult.success();
         switch (typeCode){
             case "0101":
-                String s = DeviceSubType.Cooling_Heating.getDesc() + "," + DeviceSubType.Cooling_Heating_Electric_Boiler.getDesc();
-                ajax.put("data", buildHeatingService.selDevicesBySubType(s));
+                List<String> list1 = new ArrayList<>();
+                list1.add(DeviceSubType.Cooling_Heating.getDesc());
+                list1.add(DeviceSubType.Cooling_Heating_Electric_Boiler.getDesc());
+                ajax.put("data", buildHeatingService.selDevicesBySubType(list1));
                 return ajax;
             case "0102":
-                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Boiler_Heating.getDesc()));
+                List<String> list2 = new ArrayList<>();
+                list2.add(DeviceSubType.Cooling_Heating.getDesc());
+                ajax.put("data", buildHeatingService.selDevicesBySubType(list2));
                 return ajax;
             case "0103" :
-                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Kitchen_Cooking.getDesc()));
+                List<String> list3 = new ArrayList<>();
+                list3.add(DeviceSubType.Kitchen_Cooking.getDesc());
+                ajax.put("data", buildHeatingService.selDevicesBySubType(list3));
                 return ajax;
             case "0104" :
-                ajax.put("data", buildHeatingService.selDevicesBySubType(DeviceSubType.Material_Kiln.getDesc()));
+                List<String> list4 = new ArrayList<>();
+                list4.add(DeviceSubType.Material_Kiln.getDesc());
+                ajax.put("data", buildHeatingService.selDevicesBySubType(list4));
                 return ajax;
             default:
                 ajax.put("data", buildHeatingService.selAllDevices());