From 1ccd22706067b95141c83110c142c4a66306dd27 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 十二月 2024 17:08:54 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 d344763..1e6dd8d 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
@@ -157,12 +157,7 @@
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
- List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
- if (!list.isEmpty()){
- user.setIsSign(1);
- }else {
- user.setIsSign(0);
- }
+
return R.ok(user);
}
@@ -283,6 +278,13 @@
user.setCount5(count5);
user.setCount6(count6);
user.setCount7(count7);
+
+ List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
+ if (!list.isEmpty()){
+ user.setIsSign(1);
+ }else {
+ user.setIsSign(0);
+ }
return R.ok(user);
--
Gitblit v1.7.1