diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java index cd0fd7ec..4f64b11d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java @@ -3,14 +3,11 @@ */ package com.jeesite.modules.sys.service; -import java.util.Date; - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import com.jeesite.common.entity.Page; -import com.jeesite.common.lang.DateUtils; import com.jeesite.common.service.CrudService; import com.jeesite.modules.sys.dao.LogDao; import com.jeesite.modules.sys.entity.Log; @@ -29,20 +26,17 @@ public class LogService extends CrudService { */ @Override public Page findPage(Page page, Log log) { - - // 设置默认时间范围,默认当前月 - if (log.getCreateDate_gte() == null){ - log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); - } - if (log.getCreateDate_lte() == null){ - log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); - } - +// // 设置默认时间范围,默认当前月 +// if (log.getCreateDate_gte() == null){ +// log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); +// } +// if (log.getCreateDate_lte() == null){ +// log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); +// } // 普通用户看自己的,管理员看全部的。 if (!log.getCurrentUser().isAdmin()){ log.setCreateBy(log.getCurrentUser().getUserCode()); } - return super.findPage(page, log); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java index 1a580679..17a55046 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java @@ -3,8 +3,6 @@ */ package com.jeesite.modules.sys.web; -import java.util.Date; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.jeesite.common.entity.Page; -import com.jeesite.common.lang.DateUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.sys.entity.Log; import com.jeesite.modules.sys.service.LogService; @@ -50,13 +47,13 @@ public class LogController extends BaseController { @RequiresPermissions("sys:log:view") @RequestMapping(value = "list") public String list(Log log, Model model) { - // 设置默认时间范围,默认当前月 - if (log.getCreateDate_gte() == null){ - log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); - } - if (log.getCreateDate_lte() == null){ - log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); - } +// // 设置默认时间范围,默认当前月 +// if (log.getCreateDate_gte() == null){ +// log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); +// } +// if (log.getCreateDate_lte() == null){ +// log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); +// } model.addAttribute("log", log); return "modules/sys/logList"; } diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html index 58ecf7c3..828cd11d 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -61,10 +61,10 @@
<#form:input path="createDate_gte" readonly="readonly" maxlength="20" class="form-control Wdate-date" - dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,onpicked:function(){createDate_lte.click()}});"/> + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,onpicked:function(){createDate_lte.click()}});"/>  --  <#form:input path="createDate_lte" readonly="readonly" maxlength="20" class="form-control Wdate-date" - dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>