From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/listener/fee/ListFeeConfigsListener.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeConfigsListener.java b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeConfigsListener.java
index 51725f8..777b6b3 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/ListFeeConfigsListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/ListFeeConfigsListener.java
@@ -4,12 +4,14 @@
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
+import com.java110.dto.PageDto;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeFeeConfigConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.api.feeConfig.ApiFeeConfigDataVo;
import com.java110.vo.api.feeConfig.ApiFeeConfigVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,10 @@
FeeConfigDto feeConfigDto = BeanConvertUtil.covertBean(reqJson, FeeConfigDto.class);
+ if(!StringUtil.isEmpty(reqJson.getString("isFlag")) && reqJson.getString("isFlag").equals("0")){
+ feeConfigDto.setPage(PageDto.DEFAULT_PAGE);
+ }
+
int count = feeConfigInnerServiceSMOImpl.queryFeeConfigsCount(feeConfigDto);
List<ApiFeeConfigDataVo> feeConfigs = null;
--
Gitblit v1.8.0