Merge branch 'cherry-pick-509e9bbf' into 'master'

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

See merge request huang/thingsboard3.3.2!155

@@ -99,10 +99,10 @@
             </if>
             </if>
             <if test="queryMap.selected !=null and queryMap.convertDevices !=null and queryMap.convertDevices.size>0">
             <if test="queryMap.selected !=null and queryMap.convertDevices !=null and queryMap.convertDevices.size>0">
                 <if test="queryMap.selected == true">
                 <if test="queryMap.selected == true">
-                    AND ifd.id IN
+                    AND ifd.tb_device_id IN
                 </if>
                 </if>
                 <if test="queryMap.selected == false">
                 <if test="queryMap.selected == false">
-                    AND ifd.id NOT IN
+                    AND ifd.tb_device_id NOT IN
                 </if>
                 </if>
                 <foreach collection="queryMap.convertDevices" item="convertDevice" open="(" separator="," close=")">
                 <foreach collection="queryMap.convertDevices" item="convertDevice" open="(" separator="," close=")">
                     #{convertDevice}
                     #{convertDevice}