lubo 5 kuukautta sitten
vanhempi
commit
1300844aac

+ 3 - 3
ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyCutInServiceImpl.java

@@ -136,9 +136,9 @@ public class SubsidyCutInServiceImpl implements ISubsidyCutInService {
         }
 
 
-        if (bo.getCurrentBusinessId() == null) {
-            lqw.orderByAsc(SubsidyCutIn::getQueueOrder);
-        }
+        lqw.orderByAsc(SubsidyCutIn::getSubsidyStatus);
+        lqw.orderByAsc(SubsidyCutIn::getQueueOrder);
+        lqw.orderByAsc(SubsidyCutIn::getQueueTime);
         return lqw;
     }