Merge branch 'dev' into dev-g

jsowell-pile/src/main/resources/mapper/pile/MemberStationRelationMapper.xml

@@ -82,8 +82,14 @@
 
     <select id="getStationIdListByMemberId" resultType="java.lang.String">
         select
-        <include refid="Base_Column_List"/>
+        station_id
         from member_station_relation
         where member_id = #{memberId,jdbcType=VARCHAR}
     </select>
+
+    <delete id="deleteMemberStationRelation">
+        delete from member_station_relation
+        where member_id = #{memberId,jdbcType=VARCHAR}
+        and station_id = #{stationId,jdbcType=BIGINT}
+    </delete>
 </mapper>

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -386,6 +386,12 @@
                 #{stationDeptId}
             </foreach>
         </if>
+        <if test="stationDTO.stationIds != null and stationDTO.stationIds.size() != 0">
+            and t1.id in
+            <foreach collection="stationDTO.stationIds" item="stationId" open="(" separator="," close=")">
+                #{stationId}
+            </foreach>
+        </if>
         GROUP BY
         t1.id,
         t1.station_name,