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/ZSecretServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java index 4173dda..d1d29cc 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java @@ -10,20 +10,23 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.domain.ZSecret; +import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZSecret; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZSecretMapper; +import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZSecretService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; /** * <p> @@ -38,6 +41,11 @@ @Autowired ZSecretServiceImpl zSecretService; + + @Autowired + ZInfoUserService zInfoUserService; + @Resource + ZSecretMapper zSecretMapper; private LambdaQueryWrapper<ZSecret> uniqueCondition(ZSecret zSecret) { LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>(); @@ -57,13 +65,34 @@ lqw.eq(userId != null, ZSecret::getUserId, userId) .like(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType()) .like(StringUtils.isNotEmpty(zSecret.getAccNo()), ZSecret::getAccNo, zSecret.getAccNo()) + .like(StringUtils.isNotEmpty(zSecret.getRemark()), ZSecret::getRemark, zSecret.getRemark()) + .like(StringUtils.isNotEmpty(zSecret.getLocation()), ZSecret::getLocation, zSecret.getLocation()) .eq(zSecret.getIsFinger()!=null,ZSecret::getIsFinger,zSecret.getIsFinger()) .eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate()) + .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate()) + .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace()) .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime()) .orderByDesc(ZSecret::getCreateTime); return lqw; } + private LambdaQueryWrapper<ZSecret> buildConditionSec(ZSecret zSecret, List<Long> userIds) { + LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>(); + // lqw.eq(userId != null, ZSecret::getUserId, userId) + lqw.in(ZSecret::getUserId,userIds) + + .like(StringUtils.isNotEmpty(zSecret.getType()), ZSecret::getType, zSecret.getType()) + .like(StringUtils.isNotEmpty(zSecret.getAccNo()), ZSecret::getAccNo, zSecret.getAccNo()) + .like(StringUtils.isNotEmpty(zSecret.getRemark()), ZSecret::getRemark, zSecret.getRemark()) + .like(StringUtils.isNotEmpty(zSecret.getLocation()), ZSecret::getLocation, zSecret.getLocation()) + .eq(zSecret.getIsFinger()!=null,ZSecret::getIsFinger,zSecret.getIsFinger()) + .eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate()) + .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate()) + .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace()) + .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime()) + .orderByDesc(ZSecret::getCreateTime); + return lqw; + } /** * 鍒嗛〉鏌ユ壘 */ @@ -71,7 +100,19 @@ public AjaxResult selectDataList(ZSecret zSecret, Integer pageNum, Integer pageSize) { SysUser user = SecurityUtils.getLoginUser().getUser(); Long userId = user.getUserId(); - LambdaQueryWrapper<ZSecret> lqw = buildCondition(zSecret, 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<ZSecret> lqw; + if(!fms.isEmpty()) + lqw = buildConditionSec(zSecret, fms); + else + lqw = buildCondition(zSecret, userId); + + + Page<ZSecret> pageBean = new Page<>(pageNum, pageSize); Page<ZSecret> pageResult = page(pageBean, lqw); @@ -127,6 +168,12 @@ } @Override + public AjaxResult listType() { + List<String> result = zSecretMapper.listType(); + return AjaxResult.success(result); + } + + @Override @Transactional public AjaxResult importExcel(MultipartFile file) { -- Gitblit v1.9.1