From f356a0d4d947c7db005e75e7db0d3de2bd405e7e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 11 六月 2024 23:07:12 +0800
Subject: [PATCH] 把代码加回来了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 1997d0c..4dbf8f9 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
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,10 +10,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfFamily;
-import com.ruoyi.domain.ZfRelation;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
import com.ruoyi.service.ZInfoUserService;
@@ -31,7 +26,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* <p>
@@ -68,6 +62,17 @@
HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
+ }
+
+ @Override
+ public ZInfoUser getInfoBysysId(Long sysid) {
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSysId, sysid);
+ List<ZInfoUser> list = list(lqw);
+ if(list.size()>0)
+ return list.get(0);
+ else
+ return null;
}
@Override
@@ -115,10 +120,13 @@
}
@Override
- public AjaxResult removeByUserName(List userName) {
+ public AjaxResult removeByUserName(List<String> userName) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
- lqw.in(ZInfoUser::getNickName, userName);
- List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());
+ 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());;
removeByIds(ids);
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
@@ -615,7 +623,7 @@
@Override
public ZInfoUser getInfoById(Long userId) {
- ZInfoUser user = getById(userId);
+ ZInfoUser user = getInfoBysysId(userId);
if(user!=null)
@@ -628,7 +636,7 @@
user.setRoleName(roleName);
System.out.println("dddddddddddddddddddd");
System.out.println(familyId);
- if(familyId!=-1)
+ if(familyId!=null||familyId!=-1)
{
String familyName = zfFamilyService.getById(familyId).getName();
user.setFamilyName(familyName);
@@ -793,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