'commit'

8 months ago · 01f484aa0c
parent 55c128cefd
commit 01f484aa0c
4 changed files with 4 additions and 2 deletions
--- a/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc
+++ b/WebRoot/upload/BD877F08-C14D-47EA-AB63-0EB9BDE875C2.doc
--- a/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc
+++ b/WebRoot/upload/C081A3E7-7CB1-40D0-8274-C9E835F111DE.doc
--- a/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx
+++ b/WebRoot/upload/D0D958A2-1C08-436D-B446-6D39481B2A16.xlsx
--- a/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java
+++ b/src/main/java/com/dsideal/QingLong/Gtzz/Controller/GtzzController.java
@ -570,8 +570,10 @@ public class GtzzController extends Controller {
        // 使用Collections.sort方法进行排序
        Collections.sort(finalRes, (r4, r2) -> {
            // 假设stepNum是Integer类型
-            Integer num1 = r4.getInt("stepNum");
-            Integer num2 = r2.getInt("stepNum");
+            Integer num1 = 0;
+            if (r4.get("stepNum") != null) num1 = r4.getInt("stepNum");
+            Integer num2 = 0;
+            if (r2.get("stepNum") != null) r2.getInt("stepNum");
            return num1.compareTo(num2);
        });