From 5041ac0d70a5c3fbd00b4459b504f10b6d69fe50 Mon Sep 17 00:00:00 2001
From: jlzhangyx5 <jl-zhangyx5@chinaunicom.cn>
Date: Thu, 15 May 2025 16:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebtp/project/role/service/impl/SysRoleServiceImpl.java  | 6 +-----
 .../ebtp/project/user/service/impl/SysUserServiceImpl.java  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java
index 9f49c89..8cf3282 100644
--- a/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/coscoshipping/ebtp/project/role/service/impl/SysRoleServiceImpl.java
@@ -3,14 +3,12 @@ package com.coscoshipping.ebtp.project.role.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
 import com.chinaunicom.mall.ebtp.common.exception.entity.BusinessException;
-import com.coscoshipping.ebtp.project.role.dao.SysRoleMenuMapper;
 import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu;
 import com.coscoshipping.ebtp.project.role.entity.vo.SysRoleVO;
 import com.coscoshipping.ebtp.project.role.service.SysRoleMenuService;
@@ -18,7 +16,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
 import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import com.coscoshipping.ebtp.project.role.dao.SysRoleMapper;
 import com.coscoshipping.ebtp.project.role.entity.SysRole;
 import com.coscoshipping.ebtp.project.role.service.SysRoleService;
@@ -28,7 +25,6 @@ import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.groupingBy;
@@ -47,7 +43,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper,SysRole>
     @Override
     public IPage<SysRole> getPage(SysRoleVO sysRoleVO) {
 
-        LambdaQueryWrapper query = buildQueryWrapper(sysRoleVO);
+        LambdaQueryWrapper<SysRole> query = buildQueryWrapper(sysRoleVO);
 
         if(null == sysRoleVO.getBasePageRequest()){
             sysRoleVO.setBasePageRequest(new BasePageRequest());
diff --git a/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java
index 3b3b745..263b550 100644
--- a/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/coscoshipping/ebtp/project/user/service/impl/SysUserServiceImpl.java
@@ -1,13 +1,11 @@
 package com.coscoshipping.ebtp.project.user.service.impl;
 
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
-import com.coscoshipping.ebtp.project.role.entity.SysRoleMenu;
 import com.coscoshipping.ebtp.project.user.entity.vo.SysUserVO;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
@@ -18,8 +16,6 @@ import com.coscoshipping.ebtp.project.user.entity.SysUser;
 import com.coscoshipping.ebtp.project.user.service.SysUserService;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 对数据表 sys_user 操作的 serviceImpl
@@ -32,7 +28,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper,SysUser>
     @Override
     public IPage<SysUser> getPage(SysUserVO sysUserVO) {
 
-        LambdaQueryWrapper query = buildQueryWrapper(sysUserVO);
+        LambdaQueryWrapper<SysUser> query = buildQueryWrapper(sysUserVO);
 
         if(null == sysUserVO.getBasePageRequest()){
             sysUserVO.setBasePageRequest(new BasePageRequest());