| | |
|---|
| | | import com.ruoyi.system.service.ISysRoleService; |
|---|
| | | import com.ruoyi.system.service.ISysUserRoleService; |
|---|
| | | import com.ruoyi.system.service.ISysUserService; |
|---|
| | | import io.seata.common.util.StringUtils; |
|---|
| | | import io.swagger.annotations.Api; |
|---|
| | | import io.swagger.annotations.ApiOperation; |
|---|
| | | import io.swagger.annotations.ApiParam; |
|---|
| | |
|---|
| | | import javax.servlet.http.HttpServletResponse; |
|---|
| | | import org.springframework.beans.factory.annotation.Autowired; |
|---|
| | | import org.springframework.util.CollectionUtils; |
|---|
| | | import org.springframework.util.StringUtils; |
|---|
| | | import org.springframework.validation.annotation.Validated; |
|---|
| | | import org.springframework.web.bind.annotation.DeleteMapping; |
|---|
| | | import org.springframework.web.bind.annotation.GetMapping; |
|---|
| | |
|---|
| | | |
|---|
| | | PageInfo<SysRole> page = roleService.page(pageInfo, |
|---|
| | | new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId, 20) |
|---|
| | | .like(StringUtils.isNotBlank(query.getRoleName()), SysRole::getRoleName, |
|---|
| | | .like(StringUtils.hasLength(query.getRoleName()), SysRole::getRoleName, |
|---|
| | | query.getRoleName()).eq(SysRole::getDelFlag, "0")); |
|---|
| | | return AjaxResult.success(page); |
|---|
| | | } |
|---|
| | |
|---|
| | | if(CollectionUtils.isEmpty(menuIds1)){ |
|---|
| | | return AjaxResult.error("菜单id不能为空"); |
|---|
| | | } |
|---|
| | | role.setMenuIds(dto.getMenuIds().toArray(new Long[0])); |
|---|
| | | role.setMenuIds(dto.getMenuIds().toArray((new Long[dto.getMenuIds().size()]))); |
|---|
| | | // 添加角色 |
|---|
| | | role.setCreateBy(SecurityUtils.getUsername()); |
|---|
| | | role.setCreateTime(new Date()); |
|---|
