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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -80,5 +80,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
 
     @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<Map<String,Object>> selectStateCount(String regionalCompaniesCode, String amosCompanyCode, String type);
+
+    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type);
 }

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

@@ -699,8 +699,8 @@
         from hygf_jp_station
         <where>
             hygf_jp_station.regional_companies_code is not null
-            <if test="powerStationId!=null">
-                and hygf_jp_station.thirdStationId =#{thirdStationId}
+            <if test="thirdStationId!=null">
+                and hygf_jp_station.third_station_id =#{thirdStationId}
             </if>
             <if test="type!=null and type != ''">
                 and hygf_jp_station.type =#{type}