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/ZHonorServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
index 9c6d40f..3c5797f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java
@@ -10,17 +10,18 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZAbroad;
import com.ruoyi.domain.ZHonor;
-import com.ruoyi.domain.ZfCollection;
-import com.ruoyi.domain.ZfProperty;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZSecret;
import com.ruoyi.mapper.ZHonorMapper;
import com.ruoyi.service.ZHonorService;
+import com.ruoyi.service.ZInfoUserService;
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;
@@ -40,6 +41,11 @@
@Autowired
ZHonorServiceImpl zHonorService;
+
+ @Autowired
+ ZInfoUserService zInfoUserService;
+ @Resource
+ ZHonorMapper zHonorMapper;
private LambdaQueryWrapper<ZHonor> uniqueCondition(ZHonor zHonor){
LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();
@@ -67,7 +73,19 @@
.orderByDesc(ZHonor::getCreateTime);
return lqw;
}
+ private LambdaQueryWrapper<ZHonor> buildConditionSec(ZHonor zHonor,List<Long> userIds){
+ LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();
+ lqw.in(ZHonor::getUserId, userIds)
+ .eq(StringUtils.isNotEmpty(zHonor.getName()),ZHonor::getName,zHonor.getName())
+ .like(zHonor.getType()!=null,ZHonor::getType,zHonor.getType())
+ .like(StringUtils.isNotEmpty(zHonor.getIdNo()),ZHonor::getIdNo,zHonor.getIdNo())
+ .like(StringUtils.isNotEmpty(zHonor.getGrade()),ZHonor::getGrade,zHonor.getGrade())
+ .like(StringUtils.isNotEmpty(zHonor.getLocation()),ZHonor::getLocation,zHonor.getLocation())
+ .like(StringUtils.isNotEmpty(zHonor.getRemark()),ZHonor::getRemark,zHonor.getRemark())
+ .orderByDesc(ZHonor::getCreateTime);
+ return lqw;
+ }
/**
* 鍒嗛〉鏌ユ壘
*/
@@ -75,7 +93,20 @@
public AjaxResult selectDataList(ZHonor zHonor,Integer pageNum,Integer pageSize) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- LambdaQueryWrapper<ZHonor> lqw = buildCondition(zHonor, 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<ZHonor> lqw;
+ if(!fms.isEmpty())
+ lqw = buildConditionSec(zHonor, fms);
+ else
+ lqw = buildCondition(zHonor, userId);
+
+ // LambdaQueryWrapper<ZHonor> lqw = buildCondition(zHonor, userId);
Page<ZHonor> pageBean = new Page<>(pageNum, pageSize);
Page<ZHonor> pageResult = page(pageBean, lqw);
@@ -98,7 +129,7 @@
@Override
public List<ZHonor> selectByIds(Long[] ids) {
List<ZHonor> list = new ArrayList<>();
- if(ids.length!=0)
+ if(!(ids==null||ids.length==0))
list = listByIds(Arrays.asList(ids));
else
list = list();
@@ -106,6 +137,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zHonorMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
public AjaxResult mySave(ZHonor zHonor) {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
--
Gitblit v1.9.1