From 1618c08a4e384150a5b21671a3ee75f8c0250d3f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 19 十一月 2024 20:21:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
index e059439..8a9342e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfAncestorServiceImpl.java
@@ -134,6 +134,7 @@
@Override
public List<AncestorClan> selectByCondition(ZfAncestor zfAncestor) {
QueryWrapper<Object> lqw = new QueryWrapper<>();
+ lqw.eq(zfAncestor.getClanId() !=null , " zf_ancestor.clan_id", zfAncestor.getClanId());
lqw.like(StringUtils.isNotEmpty(zfAncestor.getName()),"zf_ancestor.name",zfAncestor.getName());
--
Gitblit v1.9.1