From ce02f12e103943dcf3077587c8ce807ffee14cd5 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 20 十一月 2024 11:56:45 +0800
Subject: [PATCH] 修改了bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 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 dabcdb4..1a38cd6 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
@@ -170,7 +170,7 @@
lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit());
lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
- lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
return lqw;
@@ -595,7 +595,7 @@
}
}
- if(genealogy.getBirth()!=null){
+ if(genealogy.getBirth()!=null&&data.getBirth()!=null){
if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
continue;
@@ -706,28 +706,25 @@
ZInfoUser user = getInfoBysysId(userId);
- if(user!=null)
- {
- Long familyId = user.getFamilyId();
- // System.out.println("dddddddddddddddddddd");
- if(user.getRoleId()==null)
- user.setRoleId(3L);
- String roleName = zfRoleService.getById(user.getRoleId()).getName();
-
- user.setRoleName(roleName);
-// System.out.println("dddddddddddddddddddd");
-// System.out.println(familyId);
-// if(familyId!=null&&familyId!=-1)
-// {
-// String familyName = zfFamilyService.getById(familyId).getName();
-// user.setFamilyName(familyName);
-// }
- }
- else{
- //鏌ヨsys_user琛�
-
+ if(user==null) {
+ //鍒╃敤userId鏌ヨ
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getUserId, userId);
+ List<ZInfoUser> list = list(lqw);
+ if(list.size()>0)
+ user = list.get(0);
+ else
+ return null;
}
+
+ Long familyId = user.getFamilyId();
+ // System.out.println("dddddddddddddddddddd");
+ if(user.getRoleId()==null)
+ user.setRoleId(3L);
+ String roleName = zfRoleService.getById(user.getRoleId()).getName();
+
+ user.setRoleName(roleName);
return user;
}
--
Gitblit v1.9.1