功率曲线

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -361,6 +361,10 @@ public class EconomicService {
 
         Date beginDate = DateUtils.parseDate(starttime);
         Date endDate = DateUtils.parseDate(endtime);
+        Date current = com.gyee.common.util.DateUtils.getCurrentDate();
+        if(endDate.after(current)){
+            endDate = current;
+        }
 
         if (type.equals("-2")) {