Merge branch 'developer' of http://36.40.66.175:5000/jxdj-zx/amos-boot-biz into developer

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

@@ -723,7 +723,7 @@
     </select>
 
 
-
+<!--      hygf_jp_station.regional_companies_code is not null-->
 <select id="selectStateCount" resultType="map">
     SELECT
     all_statuses.status,
@@ -737,9 +737,9 @@
     ) AS all_statuses
     LEFT JOIN hygf_jp_station ON all_statuses.status = hygf_jp_station.state
     <where>
-        hygf_jp_station.regional_companies_code is not null
+
         <if test="type!=null">
-            and hygf_jp_station.type =#{type}
+             hygf_jp_station.type =#{type}
         </if>
         <if test="regionalCompaniesCode!=null">
             and hygf_jp_station.regional_companies_code like concat('%',#{regionalCompaniesCode},'%')