Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -385,7 +385,7 @@
             <if test="dto.amosCompanyCode!=null">
                 and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
             </if>
-            and hygf_jp_station.`state` is not null and hygf_jp_station.`state` in ("在线","报警","离线")
+            and hygf_jp_station.`state` is not null and hygf_jp_station.`state` in ('在线','报警','离线')
 
             GROUP BY state
         </where>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper">
     <select id="getStationCapactityByStationWerks" resultType="Double">
-        select SUM(CAPACITYL) from sjgl_zsj_zsbtz where WERKS = #{WERKS} and is_del = 0 and CAPACITYL is not null
+        select SUM(CAPACITYL) from sjgl_zsj_zsbtz where WERKS = #{WERKS} and is_del = 0 and CAPACITYL is not null and CAPACITYL != ''
     </select>
 
     <select id="getStationInfoMapByStationWerks" resultType="map">