From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
index 5ea78e6..8d296ff 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
@@ -14,10 +14,16 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
@Mapper
public interface ZfAncestorMapper extends BaseMapper<ZfAncestor> {
- @Select("select * , zf_role.name as roleName from zf_ancestor, zf_clan,zf_role where zf_ancestor.clan_id = zf_clan.clan_id and zf_ancestor.role_id = zf_role.id ${ew.customSqlSegment}")
+ @Select("select * , zf_role.name as roleName from zf_ancestor inner join zf_clan on zf_ancestor.clan_id = zf_clan.clan_id inner join zf_role on zf_ancestor.role_id = zf_role.id ${ew.customSqlSegment}")
Page<AncestorClan> selectInfo(Page page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
+ @Select("select * , zf_role.name as roleName from zf_ancestor inner join zf_clan on zf_ancestor.clan_id = zf_clan.clan_id inner join zf_role on zf_ancestor.role_id = zf_role.id ${ew.customSqlSegment}")
+ List<AncestorClan> selectAllInfo( @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
}
--
Gitblit v1.9.1