From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 23 六月 2025 20:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 399ce23..a69475b 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
@@ -85,10 +85,16 @@
@Override
public List<ZInfoUser> findByUaidToFaid(String usid) {
- ZInfoUser zInfoUser = new ZInfoUser();
- zInfoUser.setUaid(usid);
- LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
- return list(lqw);
+ if(usid!=null) {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setUaid(usid);
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ List<ZInfoUser> ls = list(lqw);
+ // System.out.println(ls.size()+":==========sdfs55dfsdf");
+ return ls;
+ }else {
+ return new ArrayList<>();
+ }
}
@Override
@@ -184,7 +190,7 @@
lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
- lqw.le(zInfoUser.getUaid()!=null, ZInfoUser::getUaid, zInfoUser.getUserId());
+ lqw.eq(zInfoUser.getUaid() !=null, ZInfoUser::getUaid, zInfoUser.getUaid());
return lqw;
}
--
Gitblit v1.9.1