Merge branch 'localhost-cxy' into 'master'

fix: 场景联动状态修改

See merge request huang/thingsboard3.3.2!37

@@ -29,7 +29,7 @@
             <if test="queryMap.name !=null and queryMap.name !=''">
                 AND s.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
             </if>
-            <if test="queryMap.status !=null and queryMap.status!=''">
+            <if test="queryMap.status !=null">
                 AND s.status = #{queryMap.status}
             </if>
             <if test="queryMap.organizationId !=null">