Browse Source

Merge remote-tracking branch 'origin/feat-20250814-packagefilter' into pre

dengjia 4 days ago
parent
commit
0d4ce8e994

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1952,7 +1952,8 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
                         StrUtil.isNotBlank(query.getTaskNumber()),
                         WmTask::getTaskNumber,
                         query.getTaskNumber())
-                    .in(WmTask::getId, remains));
+                    .in(WmTask::getId, remains)
+                    .orderByDesc(WmTask::getCreateTime));
         if (taskPage.getRecords().size() == query.getSize()) {
             break;
         } else {

+ 2 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -1500,5 +1500,7 @@
       </if>
       )
     </where>
+    ORDER BY t.create_time DESC
   </select>
+
 </mapper>