From ac3aa95b729366bd9f3a1585bbab84f75709b062 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 03 十二月 2024 20:21:29 +0800
Subject: [PATCH] 修改个人婚姻模块bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 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..3d94165 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;
@@ -181,6 +181,7 @@
LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
List<ZInfoUser> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}", list);
+
return list;
}
@@ -446,8 +447,8 @@
ZInfoUser zInfoUser = new ZInfoUser();
BeanUtils.copyProperties(genealogy, zInfoUser);
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
- lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
+// lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
+// lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
// lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
List<ZInfoUser> allPeopleList = list(lqw);
@@ -596,10 +597,12 @@
}
if(genealogy.getBirth()!=null){
- if(data.getBirth().compareTo(genealogy.getBirth())!=0){
- it.remove();
- continue;
+ if(data.getBirth()!=null) {
+ if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
+ it.remove();
+ }
}
+ else it.remove();
}
}
@@ -706,28 +709,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