修改保存角色修改

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -16,6 +16,7 @@ import com.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.core.domain.vo.SysDeptVo;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
 import com.ozs.common.core.domain.vo.SysUserVo;
+import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.system.domain.SysRoleMenu;
@@ -97,13 +98,15 @@ public class SysRoleController extends BaseController {
     @Log(title = "角色管理", businessType = BusinessType.SELECT)
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
-        vo = (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(), vo);
-        IPage<SysRole> page = roleService.queryPage(vo);
-        page.setTotal(page.getTotal());
-        page.setCurrent(page.getCurrent());
-        page.setPages(page.getPages());
+        LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
+        if (!StringUtils.isBlank(vo.getRoleName())) {
+            lw.like(SysRole::getRoleName, "%" + vo.getRoleName() + "%");
+        }
+        if (!ObjectUtils.isEmpty(vo.getStatus())) {
+            lw.eq(SysRole::getStatus, vo.getStatus());
+        }
+        IPage<SysRole> page = roleService.page(new Page<SysRole>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);
-
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)