From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index a6f5504..c90b56e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -10,14 +10,15 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZYearInfo;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZYearInfo;
import com.ruoyi.mapper.ZYearInfoMapper;
+import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZYearInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -25,6 +26,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -39,7 +41,8 @@
@Autowired
ZYearInfoServiceImpl zYearInfoService;
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Resource
ZYearInfoMapper zYearInfoMapper;
@@ -67,7 +70,18 @@
.orderByDesc(ZYearInfo::getCreateTime);
return lqw;
}
-
+ private LambdaQueryWrapper<ZYearInfo> buildConditionSec(ZYearInfo zYearInfo, List<Long> userId) {
+ LambdaQueryWrapper<ZYearInfo> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ZYearInfo::getUid, userId)
+ .like(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
+ .like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
+ .like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
+ .like(StringUtils.isNotEmpty(zYearInfo.getNotice()),ZYearInfo::getNotice,zYearInfo.getNotice())
+ .like(StringUtils.isNotEmpty(zYearInfo.getRemark()),ZYearInfo::getRemark,zYearInfo.getRemark())
+ .between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime())
+ .orderByDesc(ZYearInfo::getCreateTime);
+ return lqw;
+ }
/**
* 鍒嗛〉鏌ユ壘
*/
@@ -75,8 +89,16 @@
public AjaxResult selectDataList(ZYearInfo zYearInfo, Integer pageNum, Integer pageSize) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- LambdaQueryWrapper<ZYearInfo> lqw = buildCondition(zYearInfo, userId);
-
+ // LambdaQueryWrapper<ZYearInfo> lqw = buildCondition(zYearInfo, 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<ZYearInfo> lqw;
+ if(!fms.isEmpty())
+ lqw = buildConditionSec(zYearInfo, fms);
+ else
+ lqw = buildCondition(zYearInfo, userId);
Page<ZYearInfo> pageBean = new Page<>(pageNum, pageSize);
Page<ZYearInfo> pageResult = page(pageBean, lqw);
@@ -126,6 +148,15 @@
}
@Override
+ public List<ZYearInfo> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZYearInfo zYearInfo = new ZYearInfo();
+ LambdaQueryWrapper<ZYearInfo> lqw = buildCondition(zYearInfo, userId);
+ return list(lqw);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1