Merge branch 'refs/heads/master' into release-sy-v1.0.0

4 months ago · f512a2c981
1 changed files with 3 additions and 1 deletions
--- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
+++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java
@ -96,7 +96,9 @@ public class BsSgcSzSafeJbxxController extends BaseController {
                        .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
                        .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
                        .isNull(BsSgcSzSafeJbxx::getExprDate)
-                        .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
+//                        .orderByDesc(BsSgcSzSafeJbxx::getCreateTime)
+                        .orderByAsc(BsSgcSzSafeJbxx::getEngScal));
+

        return page;