From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
index d9462d3..1c71eb5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java
@@ -8,10 +8,8 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.domain.Physcial;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZHealthHabit;
-import com.ruoyi.domain.ZHealthHabit;
-import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.health.*;
@@ -44,18 +42,25 @@
LambdaQueryWrapper<ZHealthHabit> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZHealthHabit::getUid,userId);
ZHealthHabit zHealthHabit = getOne(lqw);
+ System.out.println("+++++++6676+++++++++++");
+
if(zHealthHabit==null)
{
//鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ System.out.println("++++++++++++++++++");
+
//鎷垮埌鎵�鏈夌殑sysid
List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
for(Long id:fms)
{
+ LambdaQueryWrapper<ZHealthHabit> lqw1 = new LambdaQueryWrapper<>();
if(!id.equals(userId))
{
- lqw.eq(ZHealthHabit::getUid, id);
- zHealthHabit = getOne(lqw);
+ System.out.println("++++++++++++++++++");
+ System.out.println(id);
+ lqw1.eq(ZHealthHabit::getUid, id);
+ zHealthHabit = getOne(lqw1);
break;
}
}
@@ -95,8 +100,16 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
+ //鑾峰彇鍒板悓涓�鐢ㄦ埛鐨剆ys_userId 鍙瓨鎴栦慨鏀逛竴鏉℃暟鎹�
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ String uaid = zInfoUser.getUaid();
+ List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(uaid);
+ List<Long> collect = byUaidToFaid.stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+
+
+
LambdaQueryWrapper<ZHealthHabit> lqw = new LambdaQueryWrapper<>();
- lqw.eq(ZHealthHabit::getUid,userId);
+ lqw.in(ZHealthHabit::getUid,collect);
ZHealthHabit getResult = getOne(lqw);
ZHealthHabit zHealthHabit = new ZHealthHabit();
--
Gitblit v1.9.1