1.5.8-hgw-权限-角色-账号

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysRoleMenuResServiceImpl.java

@@ -15,7 +15,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl;/*
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.permission.mapper.SysRoleMenuResMapper;
 import com.yifu.cloud.plus.v1.permission.service.SysRoleMenuResService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysRoleMenuRes;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysRoleMenuResSearchVo;
 import lombok.extern.log4j.Log4j2;
@@ -62,7 +60,6 @@ public class SysRoleMenuResServiceImpl extends ServiceImpl<SysRoleMenuResMapper,
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
 		return baseMapper.selectList(wrapper);
 	}
 
@@ -80,14 +77,6 @@ public class SysRoleMenuResServiceImpl extends ServiceImpl<SysRoleMenuResMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(SysRoleMenuResSearchVo entity) {
 		LambdaQueryWrapper<SysRoleMenuRes> wrapper = Wrappers.lambdaQuery();
-		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-			wrapper.ge(SysRoleMenuRes::getCreateTime, entity.getCreateTimes()[0])
-					.le(SysRoleMenuRes::getCreateTime,
-							entity.getCreateTimes()[1]);
-		}
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.eq(SysRoleMenuRes::getCreateName, entity.getCreateName());
-		}
 		return wrapper;
 	}
 

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserRoleResServiceImpl.java

@@ -15,7 +15,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl;/*
  * Author: lengleng (wangiegie@gmail.com)
  */
 
-import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.permission.mapper.SysUserRoleResMapper;
 import com.yifu.cloud.plus.v1.permission.service.SysUserRoleResService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
-import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import com.yifu.cloud.plus.v1.yifu.permission.entity.SysUserRoleRes;
 import com.yifu.cloud.plus.v1.yifu.permission.vo.SysUserRoleResSearchVo;
 import lombok.extern.log4j.Log4j2;
@@ -62,7 +60,6 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
 		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
 			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
 		}
-		wrapper.orderByDesc(BaseEntity::getCreateTime);
 		return baseMapper.selectList(wrapper);
 	}
 
@@ -78,14 +75,6 @@ public class SysUserRoleResServiceImpl extends ServiceImpl<SysUserRoleResMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(SysUserRoleResSearchVo entity) {
 		LambdaQueryWrapper<SysUserRoleRes> wrapper = Wrappers.lambdaQuery();
-		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
-			wrapper.ge(SysUserRoleRes::getCreateTime, entity.getCreateTimes()[0])
-					.le(SysUserRoleRes::getCreateTime,
-							entity.getCreateTimes()[1]);
-		}
-		if (Common.isNotNull(entity.getCreateName())) {
-			wrapper.eq(SysUserRoleRes::getCreateName, entity.getCreateName());
-		}
 		return wrapper;
 	}