diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java index dd6495b6..50279f6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java @@ -118,8 +118,10 @@ public class CraftAbilityController extends BladeController { Date startTime = null; Date endTime = null; if(craftAbility.containsKey("startTime")){ - startTime = DateUtil.parse(Func.toStr(craftAbility.get("startTime")),"yyyy-MM-dd HH:mm:ss"); - endTime = DateUtil.parse(Func.toStr(craftAbility.get("endTime")),"yyyy-MM-dd HH:mm:ss"); + String startTimeStr = Func.toStr(craftAbility.get("startTime"))+" 00:00:00"; + String endTimeStr = Func.toStr(craftAbility.get("endTime"))+" 23:59:59"; + startTime = DateUtil.parse(startTimeStr,"yyyy-MM-dd HH:mm:ss"); + endTime = DateUtil.parse(endTimeStr,"yyyy-MM-dd HH:mm:ss"); }