From 082ba3d3cd975f182425448bcea3a9166b70980b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:12:38 +0800
Subject: [PATCH] 修改了个人模块几个模块可以共享数据了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
index 90f9e84..107c189 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
@@ -10,9 +10,12 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZHonor;
import com.ruoyi.domain.ZIdea;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.mapper.ZIdeaMapper;
import com.ruoyi.service.ZIdeaService;
+import com.ruoyi.service.ZInfoUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +25,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -36,7 +40,8 @@
@Autowired
ZIdeaServiceImpl zIdeaService;
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
private LambdaQueryWrapper<ZIdea> uniqueCondition(ZIdea zIdea) {
LambdaQueryWrapper<ZIdea> lqw = new LambdaQueryWrapper<>();
lqw.eq(StringUtils.isNotEmpty(zIdea.getTitle()), ZIdea::getTitle, zIdea.getTitle())
@@ -64,7 +69,19 @@
.orderByDesc(ZIdea::getCreateTime);
return lqw;
}
-
+ private LambdaQueryWrapper<ZIdea> buildConditionSec(ZIdea zIdea, List<Long> userIds){
+ LambdaQueryWrapper<ZIdea> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ZIdea::getUid, userIds)
+ .like(StringUtils.isNotEmpty(zIdea.getTitle()), ZIdea::getTitle, zIdea.getTitle())
+ .like(StringUtils.isNotEmpty(zIdea.getBeneficiary()), ZIdea::getBeneficiary, zIdea.getBeneficiary())
+ .like(StringUtils.isNotEmpty(zIdea.getHeir()), ZIdea::getHeir, zIdea.getHeir())
+ .like(StringUtils.isNotEmpty(zIdea.getDifficulty()), ZIdea::getDifficulty, zIdea.getDifficulty())
+ .like(StringUtils.isNotEmpty(zIdea.getCause()), ZIdea::getCause, zIdea.getCause())
+ .like(zIdea.getIsEffective()!=null, ZIdea::getIsEffective, zIdea.getIsEffective())
+ .between(zIdea.getHappenStartTime() != null && zIdea.getHappenEndTime() != null, ZIdea::getHappenTime, zIdea.getHappenStartTime(), zIdea.getHappenEndTime())
+ .orderByDesc(ZIdea::getCreateTime);
+ return lqw;
+ }
/**
* 鍒嗛〉鏌ユ壘
*/
@@ -72,8 +89,16 @@
public AjaxResult selectDataList(ZIdea zIdea, Integer pageNum, Integer pageSize) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- LambdaQueryWrapper<ZIdea> lqw = buildCondition(zIdea, userId);
-
+ // LambdaQueryWrapper<ZIdea> lqw = buildCondition(zIdea, userId);
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+ LambdaQueryWrapper<ZIdea> lqw;
+ if(!fms.isEmpty())
+ lqw = buildConditionSec(zIdea, fms);
+ else
+ lqw = buildCondition(zIdea, userId);
Page<ZIdea> pageBean = new Page<>(pageNum, pageSize);
Page<ZIdea> pageResult = page(pageBean, lqw);
--
Gitblit v1.9.1