Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -42,7 +42,7 @@
        + " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" + " <where> " +

        "<if test='pageEldersAuthDTO.communityId != null'>"
        + "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " + " </if> " +
        + "  AND ac.community_id = ${pageEldersAuthDTO.communityId} " + " </if> " +

        "<if test='pageEldersAuthDTO.sumitUserId != null'>"
        + " AND ea.submit_user_id = #{pageEldersAuthDTO.sumitUserId} " + " </if> "
@@ -84,7 +84,7 @@
        + " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" + " <where> " +

        "<if test='pageEldersAuthDTO.communityId != null'>"
        + "  AND ac.community_id = #{pageEldersAuthDTO.communityId} " + " </if> " +
        + "  AND ac.community_id = ${pageEldersAuthDTO.communityId} " + " </if> " +

        "<if test='pageEldersAuthDTO.ids != null and pageEldersAuthDTO.ids.length>0 '>" + " AND ea.id in "
        + "<foreach collection='pageEldersAuthDTO.ids' item='id' index='index' open='(' close=')' separator=',' >\n"