From fbfde8292c1ab06ccd943ef4c7acfe3c0e4101a1 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 19:42:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 892dcdc..8d296ff 100644
--- a/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
+++ b/zhang-content/src/main/java/com/ruoyi/mapper/ZfAncestorMapper.java
@@ -19,11 +19,11 @@
@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, 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}")
List<AncestorClan> selectAllInfo( @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
}
--
Gitblit v1.9.1