Commit c8d16280efcae3b8ead2a1ad27d0d354a3d9d990

Authored by 云中非
Committed by xp.Huang
1 parent 5f5e53dd

fix(DEFECT-1028): 设备选中和未选中过滤无效问题修复


(cherry picked from commit 457c08e40a5338acc4ec62bc9d89c2ea5abfe4ea)
... ... @@ -377,6 +377,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
377 377 for (ConvertDevicesDTO convertDevicesDTO : datasourceContentDTO.getConvertDevices()) {
378 378 deviceIds.addAll(convertDevicesDTO.getDevices());
379 379 }
  380 + deviceIds.add(UUID.randomUUID().toString());
380 381 queryMap.put("convertDevices", deviceIds);
381 382 }
382 383 }
... ...
... ... @@ -99,10 +99,10 @@
99 99 </if>
100 100 <if test="queryMap.selected !=null and queryMap.convertDevices !=null and queryMap.convertDevices.size>0">
101 101 <if test="queryMap.selected == true">
102   - AND ifd.id IN
  102 + AND ifd.tb_device_id IN
103 103 </if>
104 104 <if test="queryMap.selected == false">
105   - AND ifd.id NOT IN
  105 + AND ifd.tb_device_id NOT IN
106 106 </if>
107 107 <foreach collection="queryMap.convertDevices" item="convertDevice" open="(" separator="," close=")">
108 108 #{convertDevice}
... ...