diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 8274819..6b8c6a9 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -224,9 +224,30 @@ \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index 8f311f8..91e467e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -235,7 +235,7 @@ public class ReportController extends BaseController { Integer currentPage, Integer pageSize) { Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", - areaId, "tempId", tempId, "couponType", couponType); + areaId, "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", currentPage, "pageSize", pageSize); return reportService.couponInfo(param); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index 17aa6ee..dc1b8e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -1,6 +1,6 @@ package com.lyms.platform.operate.web.utils; -import org.eclipse.jetty.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; import java.util.ArrayList; @@ -24,7 +24,7 @@ public class CollectionUtils { for (int i = 0; i < args.length; i++) { String key = args[i++].toString(); Object value = args[i]; - if(value != null && StringUtil.isNotBlank(value.toString())) { + if(value != null && StringUtils.isNotBlank(value.toString())) { map.put(key, value); } }