查询规则商户接口修改

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabConfigRuleEnterpriseMapper.java

@@ -61,5 +61,5 @@ public interface TabConfigRuleEnterpriseMapper {
 
     List<RuleEnterpriseDTO> listEnterpriseRule(@Param("enterpriseRuleId") Integer enterpriseRuleId, @Param("search") String search);
 
-    List<RuleEnterpriseDTO> listEnterpriseRuleAll();
+    List<TabConfigRuleEnterprise> listEnterpriseRuleAll();
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/ConfigRuleEnterpriseService.java

@@ -135,5 +135,5 @@ public interface ConfigRuleEnterpriseService {
     
* @author guojuxing 

      * @return  java.util.List<com.gic.enterprise.dto.rule.RuleEnterpriseDTO>

     
*/
-    List<RuleEnterpriseDTO> listEnterpriseRule();
+    List<TabConfigRuleEnterprise> listEnterpriseRule();
 }

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

@@ -122,7 +122,7 @@ public class ConfigRuleEnterpriseServiceImpl implements ConfigRuleEnterpriseServ
     }
 
     @Override
-    public List<RuleEnterpriseDTO> listEnterpriseRule() {
+    public List<TabConfigRuleEnterprise> listEnterpriseRule() {
         return tabConfigRuleEnterpriseMapper.listEnterpriseRuleAll();
     }
 }

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

@@ -450,9 +450,9 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
             }
         }
         //查询所有的商户规则ID、名称
-        List<RuleEnterpriseDTO> ruleEnterpriseList = configRuleEnterpriseService.listEnterpriseRule();
+        List<TabConfigRuleEnterprise> ruleEnterpriseList = configRuleEnterpriseService.listEnterpriseRule();
         if (CollectionUtils.isNotEmpty(ruleEnterpriseList)) {
-            for (RuleEnterpriseDTO ruleEnterpriseDTO : ruleEnterpriseList) {
+            for (TabConfigRuleEnterprise ruleEnterpriseDTO : ruleEnterpriseList) {
                 enterpriseRuleMap.put(ruleEnterpriseDTO.getEnterpriseRuleId().toString(),
                         ruleEnterpriseDTO.getRuleName());
             }