Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -21,7 +21,7 @@
        + "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != &quot;&quot;'>"
        + " and a.name LIKE concat( '%', #{pageComCvtBusinessDTO.name}, '%' )  " + " </if> "
        + "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>"
        + " and a.community_id = #{pageComCvtBusinessDTO.communityId} " + " </if> " + " </where>"
        + " and a.community_id = ${pageComCvtBusinessDTO.communityId} " + " </if> " + " </where>"
        + " order by a.create_at desc" + "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page,
        @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);
@@ -29,7 +29,7 @@
    @Select("<script> " + "SELECT " + "t.*  " + "FROM " + "com_cvt_business t  " + " <where>"
        + "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>"
        + " t.area_flag = 1 " + " OR (" + " t.area_flag = 2 "
        + " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = #{comCvtBusinessAppletsDTO.communityId} ) \n"
        + " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = ${comCvtBusinessAppletsDTO.communityId} ) \n"
        + " ) " + " </if> " + " </where>" + " order by t.create_at desc" + "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page,
        @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);