From e421b95541e2796a7c7b2cee7930fe27f9a33d1d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 三月 2025 15:38:17 +0800
Subject: [PATCH] 冥想

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
index 05b87a3..2d9f8ea 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserController.java
@@ -420,6 +420,7 @@
         StringBuilder stringBuilder = new StringBuilder();
         List<AppUser> list = appUserService.lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
+                .isNotNull(AppUser::getCellPhone)
                 .ne(AppUser::getUserStatus, 3).list();
         stringBuilder.append(list.size()).append(",");
         List<AppUser> memberList = list.stream().filter(appUser ->
@@ -734,6 +735,7 @@
         appUserWalletRecordLambdaQueryWrapper.like(org.springframework.util.StringUtils.hasLength(dto.getCellPhone()),AppUser::getCellPhone,dto.getCellPhone());
         appUserWalletRecordLambdaQueryWrapper.like(org.springframework.util.StringUtils.hasLength(dto.getNickName()),AppUser::getNickname,dto.getNickName());
         appUserWalletRecordLambdaQueryWrapper.orderByDesc(BaseModel::getCreateTime);
+        appUserWalletRecordLambdaQueryWrapper.isNotNull(AppUser::getCellPhone);
         List<AppUser> page = appUserService
                 .list(appUserWalletRecordLambdaQueryWrapper);
         List<UserInfoExport> userInfoExports = new ArrayList<>();
@@ -809,7 +811,8 @@
                 .eq(Objects.nonNull(courseDTO.getGender()), AppUser::getGender, courseDTO.getGender())
                 .eq(Objects.nonNull(courseDTO.getUserStatus()), AppUser::getUserStatus, courseDTO.getUserStatus())
                 .between(Objects.nonNull(startTime),AppUser::getVipExpireTime,startTime,endTime)
-                .between(Objects.nonNull(startTime1),AppUser::getRegisterTime,startTime1,endTime1)
+                .between(Objects.nonNull(startTime1),AppUser::getRegisterTime,startTime1,endTime1);
+        courseLambdaQueryWrapper.isNotNull(AppUser::getCellPhone)
                 .orderByDesc(AppUser::getRegisterTime);
         if (org.springframework.util.StringUtils.hasLength(courseDTO.getVipType())){
             String[] split = courseDTO.getVipType().split(",");
@@ -1182,7 +1185,7 @@
         byId.setUserStatus(3);
         byId.setLogoutTime(LocalDateTime.now());
         appUserService.updateById(byId);
-        appUserService.removeById(byId);
+//        appUserService.removeById(byId);
         remoteUserService.removeByAppUserId(byId.getUserId());
         return R.ok();
     }

--
Gitblit v1.7.1