From a19c350a3f55762dc93246b024c3cf2ff852bded Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 15 三月 2023 10:49:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index bcb4ae6..34b993d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -729,7 +729,7 @@
                 wrkMasts.add(wrkMast);
                 count++;
                 if(count==0) continue;
-                if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime())
+                if(wrkMast.getWrkDate().getTime()<wrkMasts.get(i).getWrkDate().getTime() && wrkMast.getIoPri()<wrkMasts.get(i).getIoPri())
                     i=count;
                 crnStn1=crnStn;
             }

--
Gitblit v1.9.1