Merge branch 'milestone-20250723-wwl' into wuweili/feature-20250715095139-抽奖众筹

lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java

@@ -122,12 +122,13 @@ public class AdminUserController {
     @PostMapping("/list/fix")
     public Result<PageInfo<UserVo>> getAllFixUser(@RequestBody UserQueryDto userQueryDto){
         LOGGER.info("分页查询所有内定用户");
-        if (userQueryDto.getPageNum() == null) {
-            userQueryDto.setPageNum(1);
-        }
-        if (userQueryDto.getPageSize() == null) {
-            userQueryDto.setPageSize(10);
-        }
+        //if (userQueryDto.getPageNum() == null) {
+        //    userQueryDto.setPageNum(1);
+        //}
+        //if (userQueryDto.getPageSize() == null) {
+        //    userQueryDto.setPageSize(10);
+        //}
+        System.out.println(userQueryDto.getPageNum() + " " +userQueryDto.getPageSize() + " " +userQueryDto);
         return Result.success(adminUserDetailService.listFixUser(userQueryDto.getPageNum(),userQueryDto.getPageSize(),userQueryDto));
     }
 

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserDetailServiceImpl.java

@@ -194,7 +194,7 @@ public class AdminUserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, U
         // 10. 重新构建分页结果
         PageInfo<UserVo> pageInfo = PageInfo.of(detailPageResult, userVoList);
         pageInfo.setList(userVoList);
-        pageInfo.setTotal(userVoList.size()); // 修正总数
+        pageInfo.setTotal(detailPageResult.getTotal()); // 修正总数
 
         return pageInfo;
     }

lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java

@@ -294,7 +294,7 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
 
         // 1. 获取所有内定用户(所有等级)
         LambdaQueryWrapper<UserDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UserDetail::getIsFixed, 1);
+        wrapper.eq(UserDetail::getIsFixed, 1).eq(UserDetail::getIsDel, 0);
         List<UserDetail> allFixedUsers = userDetailMapper.selectList(wrapper);
 
         // 2. 获取所有内定用户的ID