From 404e7b663bd2f9440a808dab938438aed849136a Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 3 Jan 2025 21:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/UserPrizeExchangeServiceImpl.java | 9 ++++++++- .../course/service/impl/CourseCollectServiceImpl.java | 2 +- .../controller/DiscSpinningRecordController.java | 5 +++-- .../sqx/modules/sys/controller/SysLoginController.java | 2 +- .../sqx/modules/sys/controller/SysUserController.java | 2 +- .../java/com/sqx/modules/sys/dao/SysUserRoleDao.java | 4 ++-- .../java/com/sqx/modules/sys/entity/SysUserEntity.java | 2 +- .../com/sqx/modules/sys/service/SysUserRoleService.java | 8 ++++---- .../modules/sys/service/impl/SysUserRoleServiceImpl.java | 8 ++++---- src/main/resources/mapper/sys/SysUserRoleDao.xml | 4 ++-- 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java index 32e4fe65..4e3f09fd 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserPrizeExchangeServiceImpl.java @@ -9,6 +9,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.aliyun.tea.ValidateException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -28,6 +29,7 @@ import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.discSpinning.dao.DiscSpinningRecordDao; import com.sqx.modules.discSpinning.entity.DiscSpinningRecord; +import com.sqx.modules.discSpinning.service.DiscSpinningRecordService; import com.sqx.modules.taskCenter.dao.TaskCenterRecordDao; import com.sqx.modules.taskCenter.dao.TaskCenterRewardDao; import com.sqx.modules.taskCenter.entity.TaskCenterRecord; @@ -54,6 +56,8 @@ public class UserPrizeExchangeServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", dto.getForeignId()); + queryWrapper.eq("user_id", currentUserId); + DiscSpinningRecord record = discSpinningRecordService.getOne(queryWrapper); if (record == null) { throw new SqxException("中奖记录不存在"); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 2f8b52a5..0bf376df 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -120,7 +120,7 @@ public class CourseCollectServiceImpl extends ServiceImpl collectList = baseMapper.selectByUserId(userId, classify); // Set courseIdList = collectList.stream().map(CourseCollect::getCourseId).collect(Collectors.toSet()); diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java index b8c414e2..b19b830d 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningRecordController.java @@ -41,7 +41,8 @@ public class DiscSpinningRecordController { public Result selectDiscSpinningRecord(Integer page, Integer limit, @RequestAttribute("userId") Long userId) { PageHelper.startPage(page, limit); List list = discSpinningRecordService.list(new QueryWrapper().eq("user_id", userId).orderByDesc("create_time")); - return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true)); + PageInfo pageInfo = new PageInfo<>(list); + PageUtils pageUtils = PageUtils.page(pageInfo, true); + return Result.success().put("data", pageUtils); } } - diff --git a/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java b/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java index fcfc900b..31a91e78 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysLoginController.java @@ -86,7 +86,7 @@ public class SysLoginController extends AbstractController { user.setIsChannel(1); user.setQdRate(new BigDecimal("0.01")); user.setStatus(1); - user.setRoleIdList(Collections.singletonList(4L)); + user.setRoleIdList(Collections.singletonList("4")); ValidatorUtils.validateEntity(user, AddGroup.class); user.setUserId(InvitationCodeUtil.getSnowFlakeId()); sysUserService.saveUser(user); diff --git a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java index a39f9332..3ed65381 100644 --- a/src/main/java/com/sqx/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/sqx/modules/sys/controller/SysUserController.java @@ -88,7 +88,7 @@ public class SysUserController extends AbstractController { SysUserEntity user = sysUserService.getById(userId); //获取用户所属的角色列表 - List roleIdList = sysUserRoleService.queryRoleIdList(userId); + List roleIdList = sysUserRoleService.queryRoleIdList(userId); user.setRoleIdList(roleIdList); return Result.success().put("user", user); diff --git a/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java b/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java index b0d82b7b..5c71317b 100644 --- a/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java +++ b/src/main/java/com/sqx/modules/sys/dao/SysUserRoleDao.java @@ -12,11 +12,11 @@ import java.util.List; */ @Mapper public interface SysUserRoleDao extends BaseMapper { - + /** * 根据用户ID，获取角色ID列表 */ - List queryRoleIdList(Long userId); + List queryRoleIdList(Long userId); /** diff --git a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java index eaf48694..c7c36565 100644 --- a/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java +++ b/src/main/java/com/sqx/modules/sys/entity/SysUserEntity.java @@ -72,7 +72,7 @@ public class SysUserEntity implements Serializable { * 角色ID列表 */ @TableField(exist=false) - private List roleIdList; + private List roleIdList; /** * 创建者ID diff --git a/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java b/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java index 66abf8c2..91080574 100644 --- a/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java +++ b/src/main/java/com/sqx/modules/sys/service/SysUserRoleService.java @@ -12,13 +12,13 @@ import java.util.List; * */ public interface SysUserRoleService extends IService { - - void saveOrUpdate(Long userId, List roleIdList); - + + void saveOrUpdate(Long userId, List roleIdList); + /** * 根据用户ID，获取角色ID列表 */ - List queryRoleIdList(Long userId); + List queryRoleIdList(Long userId); /** * 根据角色ID数组，批量删除 diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java index 3945616b..d8f30068 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { @Override - public void saveOrUpdate(Long userId, List roleIdList) { + public void saveOrUpdate(Long userId, List roleIdList) { if (roleIdList == null || roleIdList.isEmpty()) { return; } @@ -27,17 +27,17 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryRoleIdList(Long userId) { + public List queryRoleIdList(Long userId) { return baseMapper.queryRoleIdList(userId); } diff --git a/src/main/resources/mapper/sys/SysUserRoleDao.xml b/src/main/resources/mapper/sys/SysUserRoleDao.xml index 0ab42808..f08a6fff 100644 --- a/src/main/resources/mapper/sys/SysUserRoleDao.xml +++ b/src/main/resources/mapper/sys/SysUserRoleDao.xml @@ -10,7 +10,7 @@ - select role_id from sys_user_role where user_id = #{value} - \ No newline at end of file +