From 1d599e2e60de9b7e8d849f0f90c780f9fdfbe48f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:05 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 51a5b88..834ecc6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -272,15 +272,54 @@
user.setTopUser(byId);
}
//获取绑定下级列表
- List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getId()).list();
+ List<AppUser> list = appUserService.lambdaQuery()
+ .eq(AppUser::getInviteUserId, user.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .list();
for (AppUser appUser : list) {
- Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, appUser.getId()).count();
- Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count1 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 1)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count2 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 2)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count3 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 3)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count4 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 4)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count5 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 5)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count6 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 6)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count7 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 7)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
appUser.setCount1(count1);
appUser.setCount2(count2);
appUser.setCount3(count3);
@@ -331,7 +370,8 @@
}
}
List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
- .ne(AppUser::getStatus, 3));
+ .ne(AppUser::getStatus, 3)
+ .eq(AppUser::getDelFlag, 0));
ArrayList<Long> userIds = new ArrayList<>();
userIds.add(userId);
getUserAncestorList(userIds, appUserList);
@@ -350,7 +390,8 @@
user.setCount6(count6);
user.setCount7(count7);
- List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
+ List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now())
+ .eq(UserSignRecord::getAppUserId,userId).list();
if (!list.isEmpty()) {
user.setIsSign(1);
} else {
--
Gitblit v1.7.1