From 25e3e85f3d9c0f4a33ac46b576997e70ce6eb2d7 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 16 一月 2025 10:43:35 +0800
Subject: [PATCH] 增加了一个打印信息
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 97b8046..35f8603 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -13,10 +13,7 @@
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfFamilyService;
-import com.ruoyi.service.ZfRelationService;
-import com.ruoyi.service.ZfRoleService;
+import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +23,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
-
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -51,6 +47,10 @@
@Resource
private ZfRoleService zfRoleService;
+
+ @Resource
+ private ZfClanService zfClanService;
+
@Override
public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -100,22 +100,25 @@
// }
@Override
- public AjaxResult findInfoUserNameAClan(String nickName)
+ public AjaxResult findUserNameAClan(List<String> nickNames)
{
+ List<ZfShareOther> shareOtherClans = new ArrayList<>();
+ for (String nickName:nickNames) {
ZInfoUser zInfoUser = new ZInfoUser();
zInfoUser.setNickName(nickName);
LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
List<ZInfoUser> zInfoUsers = list(lqw);
- List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
for (ZInfoUser zInfoUser1: zInfoUsers) {
- ShareOtherClan shareOtherClan = new ShareOtherClan();
- shareOtherClan.setNickName(zInfoUser1.getNickName());
+ ZfShareOther shareOtherClan = new ZfShareOther();
+ shareOtherClan.setUserName(zInfoUser1.getNickName());
shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
shareOtherClan.setClanId(zInfoUser1.getClanId());
+ shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName());
shareOtherClans.add(shareOtherClan);
- }
+ }}
return AjaxResult.success(shareOtherClans);
}
@@ -596,11 +599,13 @@
}
}
- if(genealogy.getBirth()!=null&&data.getBirth()!=null){
- if(data.getBirth().compareTo(genealogy.getBirth())!=0){
- it.remove();
- continue;
+ if(genealogy.getBirth()!=null){
+ if(data.getBirth()!=null) {
+ if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
+ it.remove();
+ }
}
+ else it.remove();
}
}
@@ -784,6 +789,8 @@
}
+
+
private void recursionFindUser(List<ZInfoUser> treeList) {
if (treeList == null || treeList.isEmpty()) {
return;
--
Gitblit v1.9.1