Merge branch 'four_member' into test

101captain

2021-09-26 c0846f715052bfaa5c25054b8d6fe9fa419da374

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

@@ -30,6 +30,7 @@
import com.panzhihua.service_user.service.RoleService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -107,7 +108,7 @@
    @Override
    public R listRoleBackstage(Long communityId) {
        List<SysRoleDO> sysRoleDOS =
            roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
            roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
        if (ObjectUtils.isEmpty(sysRoleDOS)) {
            return R.fail("角色列表为空");
        }
@@ -224,7 +225,7 @@
    public R putMenuRole(MenuRoleVO menuRoleVO) {
        List<Long> menuIds = new ArrayList<>();
        Long roleId = menuRoleVO.getRoleId();
        if(menuRoleVO.getRoleName()!=null){
        if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
            SysRoleDO sysRoleDO=new SysRoleDO();
            sysRoleDO.setRoleId(roleId);
            sysRoleDO.setRoleName(menuRoleVO.getRoleName());
@@ -237,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();