Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -37,12 +37,12 @@
        + "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>"
        + " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') " + " </if> "
        + "<if test='comMngStructOtherBuildVO.communityId != null'>"
        + " and b.community_id = #{comMngStructOtherBuildVO.communityId} " + " </if> " + " </where>"
        + " and b.community_id = ${comMngStructOtherBuildVO.communityId} " + " </if> " + " </where>"
        + " order by b.create_at desc" + "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page,
        @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    @Select("SELECT\n" + "b.type_id \n" + "FROM\n" + "com_mng_struct_other_build b\n" + "WHERE\n"
        + "b.community_id = #{communityId}\n" + "GROUP BY\n" + "b.type_id")
        + "b.community_id = ${communityId}\n" + "GROUP BY\n" + "b.type_id")
    List<Long> selectAllBuildTypeIds(Long communityId);
}