From 458bed025c92c45ce7cfca3e685b9cb9548c61d3 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:54:53 +0800
Subject: [PATCH] 提交证书
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZHealthHabitServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 d13dbb7..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,14 +8,19 @@
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.ZHealthHabit;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZHealthHabit;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.dto.ZHealthHabitDto;
import com.ruoyi.domain.health.*;
import com.ruoyi.mapper.ZHealthHabitMapper;
import com.ruoyi.service.ZHealthHabitService;
+import com.ruoyi.service.ZInfoUserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,7 +32,8 @@
*/
@Service
public class ZHealthHabitServiceImpl extends ServiceImpl<ZHealthHabitMapper, ZHealthHabit> implements ZHealthHabitService {
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
public AjaxResult selectData() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -36,7 +42,30 @@
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))
+ {
+ System.out.println("++++++++++++++++++");
+ System.out.println(id);
+ lqw1.eq(ZHealthHabit::getUid, id);
+ zHealthHabit = getOne(lqw1);
+ break;
+ }
+ }
+ System.out.println("sdfsdf9990000");
+ }
//濡傛灉鏄涓�娆¤繘鏉ワ紝涔嬪墠娌℃湁杩欎釜鐢ㄦ埛鐨勬暟鎹紝鎶涘紓甯歌鐢ㄦ埛鍏堟彃鍏ユ暟鎹�
if(zHealthHabit == null){
throw new RuntimeException("绗竴娆¤繘鏉�,璇峰厛濉啓濂芥暟鎹�");
@@ -71,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