From 7fe5fb39e00749e4e412ced5703a61036752c874 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 25 六月 2024 18:49:02 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml | 1 +
javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java | 2 +-
2 files changed, 2 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..ddcebdd 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
@@ -384,7 +384,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;
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
index 55c1cc2..f0dd186 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
@@ -55,6 +55,7 @@
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
</where>
+ order by sort asc
</select>
<select id="selectProjectById" parameterType="String" resultMap="ProjectResult">
--
Gitblit v1.9.1