CeDo
2021-05-20 7db67da3ac644c99a30f3186d5c500c6b47a2eda
bugfixed
3个文件已修改
7 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -107,4 +107,6 @@
    @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
    private Date createAtEnd;
    @ApiModelProperty(value = "社区ID", hidden = false, example = "")
    private Long communityId;
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/EldersAuthApi.java
@@ -118,6 +118,7 @@
        String uuid= UUID.randomUUID().toString().replace("-","");
        //String name=uuid+".xlsx";
        pageEldersAuthDTO.setCommunityId(getCommunityId());
        R r = communityService.eldersAuthQuery(pageEldersAuthDTO);
        if (R.isOk(r)) {
            List<ExcelElderAuthDTO> excelElderAuthDTO = JSONArray.parseArray(JSONArray.toJSONString(r.getData()),ExcelElderAuthDTO.class);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/EldersAuthDAO.java
@@ -103,6 +103,10 @@
            " LEFT JOIN com_act ac ON u.community_id = ac.community_id\n" +
            " <where> " +
            "<if test='pageEldersAuthDTO.communityId != null'>" +
            "  ac.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" +