疯狂的狮子li
2021-05-08 a181c0978697e56d26b623487fafa9602b911717
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -49,20 +49,7 @@
    @Override
    @DataScope(deptAlias = "d")
    public List<SysRole> selectRoleList(SysRole role) {
        Map<String, Object> params = role.getParams();
        Object dataScope = params.get("dataScope");
        return list(new LambdaQueryWrapper<SysRole>()
                .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
                .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
                .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
                .apply(Validator.isNotEmpty(params.get("beginTime")),
                        "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
                        params.get("beginTime"))
                .apply(Validator.isNotEmpty(params.get("endTime")),
                        "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
                        params.get("endTime"))
                .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
                .orderByAsc(SysRole::getRoleSort));
        return baseMapper.selectRoleList(role);
    }
    /**