商户规则名称筛选修复

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java

@@ -202,7 +202,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
         com.github.pagehelper.Page page = configRuleEnterpriseService.listRule(search, pageNum, pageSize);
         Page<RuleEnterpriseDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
         //
-        if (pageNum != null && pageNum == 1) {
+        if (pageNum != null && pageNum == 1 && StringUtils.isBlank(search)) {
             //添加默认平台规则
             TabConfigRuleEnterpriseRel defaultRule = configRuleEnterpriseService.getByEnterpriseId(-1);
             if (defaultRule != null) {

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseMapper.xml

@@ -118,7 +118,9 @@
     from tab_config_rule_enterprise t1
     left join tab_config_rule_enterprise_rel t2 on t1.enterprise_rule_id = t2.enterprise_rule_id
     and t2.status = 1
-    and t2.enterprise_id != -1
+    <if test="search == null or search == '' ">
+      and t2.enterprise_id != -1
+    </if>
     <if test="search != null and search != '' ">
       left join tab_enterprise t3 on t2.enterprise_id = t3.enterprise_id
     </if>