From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 7bfd25c..f1534d8 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
@@ -68,6 +68,14 @@
}
@Override
+ public ZInfoUser getInfoBysysId(Long sysid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSysId, sysid);
+ List<ZInfoUser> list = list(lqw);
+ return list.get(0);
+ }
+
+ @Override
public AjaxResult getInfoByfid(Long fid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getFamilyId, fid);
@@ -115,6 +123,7 @@
public AjaxResult removeByUserName(List<String> userName) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
+ System.out.println(userName.get(0));
List<ZInfoUser> beanRecords = list(lqw);
System.out.println("555555555555555555"+beanRecords);
List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());;
@@ -614,7 +623,7 @@
@Override
public ZInfoUser getInfoById(Long userId) {
- ZInfoUser user = getById(userId);
+ ZInfoUser user = getInfoBysysId(userId);
if(user!=null)
@@ -792,6 +801,9 @@
Long spouseId = one.getSpouseId();
if (spouseId != null) {
ZInfoUser spouse = zInfoUserService.getById(spouseId);
+ // System.out.println(spouseId);
+ // System.out.println(spouse);
+ // System.out.println("0000))))))))))))))))");
spouse.setIdentity(people.getIdentity() + 1);
one.setSpouse(spouse);
}
--
Gitblit v1.9.1