diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index 8b42c5b..4fc636d 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -1,5 +1,6 @@ package com.chushang.system.controller; +import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; @@ -50,9 +51,12 @@ public class RoleController { @RequestParam(defaultValue = "10") Integer limit // 默认每页条数为10 ) { ListRoleDTO.Params params = new ListRoleDTO.Params(); - params.setBeginTime(beginTime); - params.setEndTime(endTime); - + if(StringUtils.isNotEmpty(beginTime)){ + params.setBeginTime(beginTime+" 00:00:00"); + } + if(StringUtils.isNotEmpty(endTime)){ + params.setEndTime(endTime+" 23:59:59"); + } ListRoleDTO listRole = new ListRoleDTO(); listRole.setRoleName(roleName); listRole.setRoleKey(roleKey);