仁和社区修改

101captain

2022-01-15 7b4db62ed0b80f937ac9cee1e55613116aef9b38

仁和社区修改

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -111,6 +111,7 @@
            comActActivityVO.setCommunityId(loginUserInfo.getCommunityId());
        }
        comActActivityVO.setIsApplets(1);
        comActActivityVO.setAreaCode(this.getAreaCode());
        Integer status = comActActivityVO.getStatus();
        if (null != status && status.intValue() == 4) {
            comActActivityVO.setIsIng(1);

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java

@@ -129,6 +129,7 @@
        roleVO.setCommunityId(communityId);
        roleVO.setCreateBy(userId);
        roleVO.setStatus(0);
        roleVO.setAreaCode(this.getAreaCode());
        HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper();
        roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName));
        R r = userService.addRoleBackstage(roleVO);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -244,4 +244,6 @@
    @ApiModelProperty("活动类型")
    @NotBlank(groups = AddGroup.class, message = "活动类型不能为空")
    private String activityType;

    private String areaCode;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java

@@ -61,4 +61,6 @@

    @ApiModelProperty("社区id")
    private Long communityId;

    private String areaCode;
}

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

@@ -52,6 +52,8 @@

        "<if test='comActActivityVO.choice == 0 '>" + "AND a.community_id = ${comActActivityVO.communityId} " + " </if> "
        +
        "<if test='comActActivityVO.areaCode !=null '>" + "AND ca.area_code = ${comActActivityVO.areaCode} " + " </if> "
        +

        "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>"
        + " and a.activity_name like concat(#{comActActivityVO.activityName},'%')   " + " </if> "