CeDo
2021-04-14 d2a5b25d25e8912d3e9e4ae5f9a315c386060f25
bug fixed: 过滤删除的调查问卷,添加调查问卷 调查对象
4个文件已修改
11 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -68,7 +68,7 @@
    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;
    
    @ApiModelProperty("是否社区团队或者党委 1 是 2 否")
    @ApiModelProperty("是否社区团队或者党委或管理员 1 是 2 否")
    private Integer ismemberrole;
    @ApiModelProperty("生日")
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
@@ -19,4 +19,10 @@
    private Integer joinCount;
    @ApiModelProperty("社区ID")
    private Long communityId;
    @ApiModelProperty("调查对象-居民")
    private Boolean forMasses;
    @ApiModelProperty("调查对象-党员")
    private Boolean forParty;
    @ApiModelProperty("调查对象-志愿者")
    private Boolean forVolunteer;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java
@@ -22,7 +22,7 @@
            "FROM \n" +
            " com_act_questnaire aq \n" +
            " LEFT JOIN sys_user u on aq.create_by = u.user_id \n" +
            " where 1=1 " +
            " where is_hide=0 " +
            "<if test='communityId != null and communityId!=0 '>\n" +
            " and aq.community_id = #{communityId}\n" +
            " </if> " +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -241,6 +241,7 @@
            }
            Integer countTeam = userDao.selectCountTeam(phone);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
            //Integer isSysAdmin = userDao.selectCountAdmin(phone);
            if(countTeam!=null&&countTeam>0) {
                loginUserInfoVO.setIsmemberrole(1);
            }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {