From b3b129b9e17ec0641f3e6e5589465873b3804c55 Mon Sep 17 00:00:00 2001
From: yangyx107 <1026244247@qq.com>
Date: Mon, 9 Feb 2026 14:35:00 +0800
Subject: [PATCH 1/4] fix: loggionConsole-addRule-bug

---
 .../shenyu/admin/mapper/RuleMapper.java       |  8 ++++
 .../admin/service/impl/RuleServiceImpl.java   |  2 +-
 .../main/resources/mappers/rule-sqlmap.xml    | 38 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
index 13ef28a98d49..85ca70d8702f 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
@@ -170,6 +170,14 @@ public interface RuleMapper extends ExistProvider {
      */
     List<RuleDO> selectAllByNamespaceIds(List<String> namespaceIds);
 
+    /**
+     * search by condition join selector
+     *
+     * @param condition condition
+     * @return list
+     */
+    List<RuleDO> selectByConditionJoinSelector(@Param("condition") RuleQueryCondition condition);
+
     /**
      * search by condition.
      *
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
index 0e903a943be2..0353ffc1aaa6 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
@@ -118,7 +118,7 @@ public PageInfo<RuleVO> searchByPage(final PageCondition<RuleQueryCondition> pag
         doConditionPreProcessing(condition);
         PageHelper.startPage(pageCondition.getPageNum(), pageCondition.getPageSize());
         condition.init();
-        final Page<RuleDO> doList = CastUtils.cast(ruleMapper.selectByCondition(condition));
+        final Page<RuleDO> doList = CastUtils.cast(ruleMapper.selectByConditionJoinSelector(condition));
         PageInfo<RuleVO> doPageInfo = doList.toPageInfo(RuleVO::buildRuleVO);
         for (RuleVO rule : doPageInfo.getList()) {
             rule.setMatchModeName(MatchModeEnum.getMatchModeByCode(rule.getMatchMode()));
diff --git a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
index 56cccb983a7e..28bed0315e80 100644
--- a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
@@ -194,6 +194,44 @@
         </where>
     </select>
 
+
+    <select id="selectByConditionJoinSelector" resultType="org.apache.shenyu.admin.model.entity.RuleDO" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM rule
+        <where>
+            exists(select true
+            from selector
+            where selector.id = rule.selector_id)
+            <if test="condition.keyword != null and condition.keyword != ''">
+                <bind name="keyword" value="('%' + condition.keyword + '%')"/>
+                AND rule_name LIKE #{keyword, jdbcType=VARCHAR}
+            </if>
+            <if test="condition.excluded != null and condition.excluded != ''">
+                <bind name="excluded" value="('%' + condition.excluded + '%')"/>
+                AND rule_name NOT LIKE #{excluded, jdbcType=VARCHAR}
+            </if>
+            <if test="condition.switchStatus != null">
+                AND enabled = #{condition.switchStatus, jdbcType=BOOLEAN}
+            </if>
+            <if test="condition.selectors != null and condition.selectors.size > 0">
+                AND selector_id IN
+                <foreach item="id" collection="condition.selectors" open="(" separator="," close=")">
+                    #{id, jdbcType=VARCHAR}
+                </foreach>
+            </if>
+            <if test="condition.userId != null and condition.userId != ''">
+                AND exists(select true
+                from data_permission
+                where data_id = rule.id
+                and user_id = #{condition.userId})
+            </if>
+            <if test="condition.namespaceId != null and condition.namespaceId != ''">
+                AND namespace_id = #{condition.namespaceId, jdbcType=VARCHAR}
+            </if>
+        </where>
+    </select>
+
     <select id="getPluginNameBySelectorId" resultType="java.lang.String">
         select p.name
         from plugin p

From 677a42741797fc0fac4d4ff33bb9fb07269ccb90 Mon Sep 17 00:00:00 2001
From: yangyx107 <1026244247@qq.com>
Date: Mon, 9 Feb 2026 15:15:26 +0800
Subject: [PATCH 2/4] fix: loggionConsole-addRule-bug

---
 .../main/java/org/apache/shenyu/admin/mapper/RuleMapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
index 85ca70d8702f..87422036b037 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
@@ -171,7 +171,7 @@ public interface RuleMapper extends ExistProvider {
     List<RuleDO> selectAllByNamespaceIds(List<String> namespaceIds);
 
     /**
-     * search by condition join selector
+     * search by condition join selector.
      *
      * @param condition condition
      * @return list

From 6dc0562c78ea92f71bfef5991b9a27ec423ec8bf Mon Sep 17 00:00:00 2001
From: yangyx107 <1026244247@qq.com>
Date: Wed, 11 Feb 2026 14:15:15 +0800
Subject: [PATCH 3/4] fix: loggionConsole-addRule-bug

---
 .../shenyu/admin/mapper/RuleMapper.java       |  8 ----
 .../admin/service/impl/RuleServiceImpl.java   |  9 ++++-
 .../main/resources/mappers/rule-sqlmap.xml    | 39 -------------------
 3 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
index 87422036b037..13ef28a98d49 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
@@ -170,14 +170,6 @@ public interface RuleMapper extends ExistProvider {
      */
     List<RuleDO> selectAllByNamespaceIds(List<String> namespaceIds);
 
-    /**
-     * search by condition join selector.
-     *
-     * @param condition condition
-     * @return list
-     */
-    List<RuleDO> selectByConditionJoinSelector(@Param("condition") RuleQueryCondition condition);
-
     /**
      * search by condition.
      *
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
index 0353ffc1aaa6..b2d776a61de2 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
@@ -116,9 +116,14 @@ public void doConditionPreProcessing(final RuleQueryCondition condition) {
     public PageInfo<RuleVO> searchByPage(final PageCondition<RuleQueryCondition> pageCondition) {
         RuleQueryCondition condition = pageCondition.getCondition();
         doConditionPreProcessing(condition);
-        PageHelper.startPage(pageCondition.getPageNum(), pageCondition.getPageSize());
         condition.init();
-        final Page<RuleDO> doList = CastUtils.cast(ruleMapper.selectByConditionJoinSelector(condition));
+        condition.setSelectors(
+                Optional.ofNullable(selectorMapper.selectAllByNamespaceId(condition.getNamespaceId()))
+                        .map(list -> list.stream().map(SelectorDO::getId).collect(Collectors.toList()))
+                        .orElse(null)
+        );
+        PageHelper.startPage(pageCondition.getPageNum(), pageCondition.getPageSize());
+        final Page<RuleDO> doList = CastUtils.cast(ruleMapper.selectByCondition(condition));
         PageInfo<RuleVO> doPageInfo = doList.toPageInfo(RuleVO::buildRuleVO);
         for (RuleVO rule : doPageInfo.getList()) {
             rule.setMatchModeName(MatchModeEnum.getMatchModeByCode(rule.getMatchMode()));
diff --git a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
index 28bed0315e80..3c250a09eb7c 100644
--- a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
@@ -193,45 +193,6 @@
             </if>
         </where>
     </select>
-
-
-    <select id="selectByConditionJoinSelector" resultType="org.apache.shenyu.admin.model.entity.RuleDO" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM rule
-        <where>
-            exists(select true
-            from selector
-            where selector.id = rule.selector_id)
-            <if test="condition.keyword != null and condition.keyword != ''">
-                <bind name="keyword" value="('%' + condition.keyword + '%')"/>
-                AND rule_name LIKE #{keyword, jdbcType=VARCHAR}
-            </if>
-            <if test="condition.excluded != null and condition.excluded != ''">
-                <bind name="excluded" value="('%' + condition.excluded + '%')"/>
-                AND rule_name NOT LIKE #{excluded, jdbcType=VARCHAR}
-            </if>
-            <if test="condition.switchStatus != null">
-                AND enabled = #{condition.switchStatus, jdbcType=BOOLEAN}
-            </if>
-            <if test="condition.selectors != null and condition.selectors.size > 0">
-                AND selector_id IN
-                <foreach item="id" collection="condition.selectors" open="(" separator="," close=")">
-                    #{id, jdbcType=VARCHAR}
-                </foreach>
-            </if>
-            <if test="condition.userId != null and condition.userId != ''">
-                AND exists(select true
-                from data_permission
-                where data_id = rule.id
-                and user_id = #{condition.userId})
-            </if>
-            <if test="condition.namespaceId != null and condition.namespaceId != ''">
-                AND namespace_id = #{condition.namespaceId, jdbcType=VARCHAR}
-            </if>
-        </where>
-    </select>
-
     <select id="getPluginNameBySelectorId" resultType="java.lang.String">
         select p.name
         from plugin p

From 24e5850938054172b2db03cb4210c210e8c94e27 Mon Sep 17 00:00:00 2001
From: yangyx107 <1026244247@qq.com>
Date: Thu, 12 Feb 2026 14:36:50 +0800
Subject: [PATCH 4/4] fix: loggionConsole-addRule-bug

---
 .../admin/service/impl/RuleServiceImpl.java   | 38 ++++++----
 .../shenyu/admin/service/RuleServiceTest.java | 75 +++++++++++++++++++
 2 files changed, 99 insertions(+), 14 deletions(-)

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
index b2d776a61de2..dabcc4fe1081 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
@@ -67,6 +67,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -112,16 +113,25 @@ public void doConditionPreProcessing(final RuleQueryCondition condition) {
         }
     }
 
+
     @Override
     public PageInfo<RuleVO> searchByPage(final PageCondition<RuleQueryCondition> pageCondition) {
         RuleQueryCondition condition = pageCondition.getCondition();
         doConditionPreProcessing(condition);
         condition.init();
-        condition.setSelectors(
-                Optional.ofNullable(selectorMapper.selectAllByNamespaceId(condition.getNamespaceId()))
-                        .map(list -> list.stream().map(SelectorDO::getId).collect(Collectors.toList()))
-                        .orElse(null)
-        );
+        List<String> namespaceSelectors = Optional.ofNullable(selectorMapper.selectAllByNamespaceId(condition.getNamespaceId()))
+                .map(list -> list.stream().map(SelectorDO::getId).collect(Collectors.toList()))
+                .orElse(Collections.emptyList());
+
+        List<String> finalSelectors = Optional.ofNullable(condition.getSelectors())
+                .orElseGet(Collections::emptyList);
+
+        if (!namespaceSelectors.isEmpty()) {
+            Set<String> selectorSet = new LinkedHashSet<>(finalSelectors);
+            selectorSet.addAll(namespaceSelectors);
+            finalSelectors = new ArrayList<>(selectorSet);
+        }
+        condition.setSelectors(finalSelectors);
         PageHelper.startPage(pageCondition.getPageNum(), pageCondition.getPageSize());
         final Page<RuleDO> doList = CastUtils.cast(ruleMapper.selectByCondition(condition));
         PageInfo<RuleVO> doPageInfo = doList.toPageInfo(RuleVO::buildRuleVO);
@@ -258,12 +268,12 @@ public List<RuleData> listAllByNamespaceId(final String namespaceId) {
     public List<RuleVO> listAllData() {
         return this.buildRuleVOList(ruleMapper.selectAll());
     }
-    
+
     @Override
     public List<RuleVO> listAllDataByNamespaceId(final String namespaceId) {
         return this.buildRuleVOList(ruleMapper.selectAllByNamespaceId(namespaceId));
     }
-    
+
     @Override
     public List<RuleData> findBySelectorId(final String selectorId) {
         return this.buildRuleDataList(ruleMapper.findBySelectorId(selectorId));
@@ -327,7 +337,7 @@ public ConfigImportResult importData(final List<RuleDTO> ruleList) {
         }
         return ConfigImportResult.success(successCount);
     }
-    
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ConfigImportResult importData(final String namespace, final List<RuleDTO> ruleList, final ConfigsImportContext context) {
@@ -339,7 +349,7 @@ public ConfigImportResult importData(final String namespace, final List<RuleDTO>
                 .selectAllByNamespaceId(namespace)
                 .stream()
                 .collect(Collectors.groupingBy(RuleDO::getSelectorId));
-        
+
         int successCount = 0;
         StringBuilder errorMsgBuilder = new StringBuilder();
         for (RuleDTO ruleDTO : ruleList) {
@@ -358,7 +368,7 @@ public ConfigImportResult importData(final String namespace, final List<RuleDTO>
                     .stream()
                     .map(RuleDO::getRuleName)
                     .collect(Collectors.toSet());
-            
+
             if (existRuleNameSet.contains(ruleName)) {
                 errorMsgBuilder
                         .append(ruleName)
@@ -372,10 +382,10 @@ public ConfigImportResult importData(final String namespace, final List<RuleDTO>
             RuleDO ruleDO = RuleDO.buildRuleDO(ruleDTO);
             final int ruleCount = ruleMapper.insertSelective(ruleDO);
             Optional.ofNullable(ruleDTO.getRuleConditions())
-                            .orElse(Collections.emptyList()).forEach(c -> {
-                                c.setRuleId(ruleId);
-                                c.setId(null);
-                            });
+                    .orElse(Collections.emptyList()).forEach(c -> {
+                        c.setRuleId(ruleId);
+                        c.setId(null);
+                    });
             addCondition(ruleDO, ruleDTO.getRuleConditions());
             if (ruleCount > 0) {
                 successCount++;
diff --git a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/RuleServiceTest.java b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/RuleServiceTest.java
index 518c52238ff8..6810d962e103 100644
--- a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/RuleServiceTest.java
+++ b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/RuleServiceTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.shenyu.admin.service;
 
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
@@ -35,9 +37,11 @@
 import org.apache.shenyu.admin.model.entity.RuleDO;
 import org.apache.shenyu.admin.model.entity.SelectorDO;
 import org.apache.shenyu.admin.model.page.CommonPager;
+import org.apache.shenyu.admin.model.page.PageCondition;
 import org.apache.shenyu.admin.model.page.PageParameter;
 import org.apache.shenyu.admin.model.query.RuleConditionQuery;
 import org.apache.shenyu.admin.model.query.RuleQuery;
+import org.apache.shenyu.admin.model.query.RuleQueryCondition;
 import org.apache.shenyu.admin.model.result.ConfigImportResult;
 import org.apache.shenyu.admin.model.vo.RuleVO;
 import org.apache.shenyu.admin.service.impl.RuleServiceImpl;
@@ -57,6 +61,7 @@
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -67,9 +72,11 @@
 import static org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_ID;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
@@ -257,6 +264,74 @@ public void testFindBySelectorIdList() {
         assertEquals(ruleDOList.size(), dataList.size());
     }
 
+    @Test
+    public void testSearchByPage() {
+        testSelectorMergeScenario(
+                null,
+                Arrays.asList(buildSelectorDO()),
+                1,
+                Collections.singletonList(buildSelectorDO().getId())
+        );
+
+        SelectorDO selectorDO1 = SelectorDO.builder().id("s1").build();
+        SelectorDO selectorDO2 = SelectorDO.builder().id("s2").build();
+        testSelectorMergeScenario(
+                new ArrayList<>(Arrays.asList("s1", "s3")),
+                Arrays.asList(selectorDO1, selectorDO2),
+                3,
+                Arrays.asList("s1", "s2", "s3")
+        );
+
+        testSelectorMergeScenario(
+                new ArrayList<>(Arrays.asList("s1", "s2")),
+                Collections.emptyList(),
+                2,
+                Arrays.asList("s1", "s2")
+        );
+
+        testSelectorMergeScenario(
+                new ArrayList<>(Arrays.asList("s1", "s2")),
+                null,
+                2,
+                Arrays.asList("s1", "s2")
+        );
+    }
+
+    private void testSelectorMergeScenario(final List<String> userSelectors,
+                                           final List<SelectorDO> namespaceSelectorDOs,
+                                           final int expectedSize,
+                                           final List<String> expectedContains) {
+        Page<RuleDO> emptyPage = new Page<>();
+        // 1. 构建分页条件
+        PageCondition<RuleQueryCondition> pageCondition = buildPageCondition();
+        RuleQueryCondition condition = pageCondition.getCondition();
+        condition.setSelectors(userSelectors);
+
+        // 2. Mock依赖行为
+        given(this.selectorMapper.selectAllByNamespaceId(anyString())).willReturn(namespaceSelectorDOs);
+        given(this.ruleMapper.selectByCondition(any(RuleQueryCondition.class))).willReturn(emptyPage);
+
+        // 3. 执行测试方法
+        PageInfo<RuleVO> result = ruleService.searchByPage(pageCondition);
+
+        // 4. 统一验证
+        assertNotNull(result);
+        List<String> finalSelectors = condition.getSelectors();
+        assertEquals(expectedSize, finalSelectors.size());
+        assertTrue(finalSelectors.containsAll(expectedContains));
+    }
+
+
+    private PageCondition<RuleQueryCondition> buildPageCondition() {
+        RuleQueryCondition condition = new RuleQueryCondition();
+        condition.setNamespaceId("test-namespace");
+        PageCondition<RuleQueryCondition> pageCondition = new PageCondition<>();
+        pageCondition.setCondition(condition);
+        pageCondition.setPageNum(1);
+        pageCondition.setPageSize(10);
+        return pageCondition;
+    }
+
     private void publishEvent() {
         PluginDO pluginDO = buildPluginDO();
         SelectorDO selectorDO = buildSelectorDO();