运维管理系统-用户日志监控：查询日志时间判断修改

运营管理-创业服务-活动管理：列表页出不来

src/main/java/com/lightinit/hsdataplatform/impl/admin/LoggerMoniterServiceImpl.java

@@ -32,7 +32,11 @@ public class LoggerMoniterServiceImpl implements ILoggerMoniterService {
             criteria.andTitleLike("%"+inputModel.getTitle()+"%");
         }
         if(inputModel.getCreatedAtFrom()!=null && inputModel.getCreatedAtTo()!=null){
-            criteria.andLogTimeBetween(inputModel.getCreatedAtFrom(),inputModel.getCreatedAtTo());
+            if (inputModel.getCreatedAtFrom().compareTo(inputModel.getCreatedAtTo()) == 0){
+                criteria.andLogTimeGreaterThanOrEqualTo(inputModel.getCreatedAtFrom());
+            }else {
+                criteria.andLogTimeBetween(inputModel.getCreatedAtFrom(), inputModel.getCreatedAtTo());
+            }
         }else if(inputModel.getCreatedAtFrom()!=null){
             criteria.andLogTimeGreaterThanOrEqualTo(inputModel.getCreatedAtFrom());
         } else if(inputModel.getCreatedAtTo()!=null){

src/main/webapp/pages/admin/activity_mgr/list.jsp

@@ -52,10 +52,10 @@
     $("#divGrid table tbody tr td:last-child")
         .on("click", "button[name='btnEdit']", function () {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.popBsPartial({ url: "<%=basePath%>/admin/activity_mgr/edit.htm/" + id });
+            $.popBsPartial({ url: "${pageContext.request.contextPath}/admin/activity_mgr/edit.htm/" + id });
         })
         .on("click", "button[name='btnDelete']", function() {
             var id = $(this).parent().children("input[type='hidden'][name='id']").val();
-            $.delWithConfirm({ func: $.ajaxGetRefresh, funcArgs: { ajaxGetOptions: { url: "<%=basePath%>/admin/activity_mgr/delete.action/" + id } } });
+            $.delWithConfirm({ func: $.ajaxGetRefresh, funcArgs: { ajaxGetOptions: { url: "${pageContext.request.contextPath}/admin/activity_mgr/delete.action/" + id } } });
         });
 </script>