Merge branch 'four_member' into 'test'

罗元桥

2021-09-24 95ff4c76c68947034a38f76a01379024e6f4b879

Merge branch 'four_member' into 'test'

Four member

See merge request root/zhihuishequ!189

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java

@@ -61,7 +61,7 @@
                    this.comActFourMemberDao.insert(comActFourMember);
                    return R.ok();
                }
                return R.fail(r.getMsg());
                return R.fail("手机号或账户已存在");
            }
            return R.fail("绑定管辖区域不能为空或重复");
        }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -37,6 +37,7 @@
                and t1.status =#{commonPage.status}
            </if>
        </where>
        order by t.create_time desc
    </select>

    <select id="selectBuilding" resultType="String">

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java

@@ -238,7 +238,7 @@
        if (isAll.intValue() == 1) {
            menuIds = sysMenuDAO
                .selectList(
                    new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, menuRoleVO.getCommunityId()))
                    new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2))
                .stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
        } else {
            menuIds = menuRoleVO.getMenuIds();