From d20eb679553f735bec11d49436aece640973afdf Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Wed, 4 Sep 2024 14:09:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=BF=90=E8=90=A5=E5=95=86=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java | 4 +++-
 .../src/main/resources/mapper/system/SysDeptMapper.xml        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java
index a9c869c..5e0befd 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java
@@ -268,7 +268,9 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl<EtOperatingAreaMappe
     @Override
     public List<EtOperatingArea> selectAreaAll()
     {
-        return dao.selectList(Wrappers.query());
+        QueryWrapper<EtOperatingArea> query = Wrappers.query();
+        query.orderByAsc("area_name");
+        return dao.selectList(query);
     }
 
     /**
diff --git a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
index ddf900c..414b13e 100644
--- a/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		GROUP BY d.dept_id
-		ORDER BY d.create_time DESC
+		ORDER BY d.dept_name
 	</select>
 
     <select id="selectDeptListByRoleId" resultType="Long">