Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-biz/src/main/resources/mapper/backend/DataRealTimeMapper.xml

@@ -110,8 +110,7 @@
             <foreach item="item" collection="attributeNameList" open="(" separator="," close=")">
                 #{item}
             </foreach>
-        </if>
-        and attribute_data != 0) a
+        </if>) a
         GROUP BY a.data_date,a.attribute_name;
     </select>
     <select id="QueryTotalHistoryAvrgData" resultType="com.usky.backend.domain.DataHistoryAvergerVO">
@@ -123,8 +122,7 @@
             <foreach item="item" collection="attributeNameList" open="(" separator="," close=")">
                 #{item}
             </foreach>
-        </if>
-        and attribute_data != 0) a
+        </if>) a
         GROUP BY a.data_date,a.attribute_name;
     </select>