Pārlūkot izejas kodu

fix:优化基础列表展示

wang.sq@aliyun.com 3 mēneši atpakaļ
vecāks
revīzija
b809906b24

+ 3 - 1
imcs-admin-boot/imcs-authority-biz/src/main/java/com/github/zuihou/authority/service/core/impl/StationServiceImpl.java

@@ -60,7 +60,9 @@ public class StationServiceImpl extends SuperCacheServiceImpl<StationMapper, Sta
                 .eq(Station::getOrg, station.getOrg())
                 .eq(Station::getStatus, station.getStatus())
                 .geHeader(Station::getCreateTime, data.getStartCreateTime())
-                .leFooter(Station::getCreateTime, data.getEndCreateTime());
+                .leFooter(Station::getCreateTime, data.getEndCreateTime())
+                .orderByAsc(Station::getCreateTime)
+                .orderByAsc(Station::getName);
         return baseMapper.findStationPage(page, wrapper, new DataScope());
     }
 

+ 3 - 1
imcs-admin-boot/imcs-authority-controller/src/main/java/com/github/zuihou/authority/controller/auth/UserController.java

@@ -391,7 +391,9 @@ public class UserController extends SuperCacheController<UserService, Long, User
                 .eq(userPage.getNation() != null && StrUtil.isNotEmpty(userPage.getNation().getKey()), User::getNation, userPage.getNation())
                 .eq(User::getSex, userPage.getSex())
                 .eq(User::getReadonly, false)
-                .eq(User::getStatus, userPage.getStatus());
+                .eq(User::getStatus, userPage.getStatus())
+                .orderByAsc(User::getAccount)
+                .orderByAsc(User::getName);
         baseService.findPage(page, wrapper);
     }