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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComStreetDAO.java

@@ -21,26 +21,4 @@
@Mapper
public interface ComStreetDAO extends BaseMapper<ComStreetDO> {

    @Select("<script> " +
            "SELECT\n" +
            "c.community_id,\n" +
            "c.`name`,\n" +
            "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" +
            "FROM\n" +
            "com_act c \n" +
            " <where>" +
            "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>" +
            "c.area_code = #{areaCode} \n" +
            " </if> " +
            " </where>" +
            "ORDER BY\n" +
            "distance ASC" +
            "<if test='lng != null and lng.trim() != &quot;&quot;'>" +
            " limit 10 " +
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);

    @Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
    String selectAreaName(String areaCode);
}