From 5606efe6f2778ad09d8b35280d6360cfe8f34d91 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index 8555a5f..2222f77 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -142,6 +142,8 @@
public String main(ModelMap mmap) {
mmap.put("version", Global.getVersion());
+ String loginname = ShiroUtils.getLoginName();
+ mmap.put("loginuser",loginname);
return "main";
}
@@ -384,7 +386,7 @@
@ResponseBody
@GetMapping("/system/stat/sumHoleLog")
public AjaxResult sumHoleLog() {
- AjaxResult ajaxResult = new AjaxResult();
+ AjaxResult ajaxResult = AjaxResult.success();
List<DrillDateVo> drillDateList = holeLogService.SUMHoleLog();
ajaxResult.put("drillDateList",drillDateList);
return ajaxResult;
--
Gitblit v1.9.1