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 selectAreaAll() { - return dao.selectList(Wrappers.query()); + QueryWrapper 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