From 7c95ab5ea995e0a517216864a95e3d86f29b5c68 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 04 九月 2024 08:43:30 +0800
Subject: [PATCH] 修改了父母为空的情况
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 0e3a51b..0b330bf 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
@@ -103,9 +103,10 @@
@Override
- public List<ZInfoUser> getDataBySex(Integer sex){
+ public List<ZInfoUser> getDataBySex(Integer sex, Integer clanId){
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSex, sex);
+ lqw.eq(ZInfoUser::getClanId, clanId);
List<ZInfoUser> list = list(lqw);
return list;
}
@@ -680,7 +681,8 @@
{
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);
--
Gitblit v1.9.1