Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

 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());