From 8ba71aed61e039226e4f3de1e620f47780207c14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 18 八月 2022 10:42:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bd83b19..4fe5f4f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -68,25 +68,23 @@
         }
         int workNo = 0;
         // 鍏ュ嚭搴撶被鍨�
-        if (wrkLastno.getWrkMk() == 0) {
-            workNo = wrkLastno.getWrkNo();
-            int sNo = wrkLastno.getSNo();
-            int eNo = wrkLastno.getENo();
+        workNo = wrkLastno.getWrkNo();
+        int sNo = wrkLastno.getSNo();
+        int eNo = wrkLastno.getENo();
 
-            workNo = workNo>=eNo ? sNo : workNo+1;
+        workNo = workNo>=eNo ? sNo : workNo+1;
 
-            while (true) {
-                WrkMast wrkMast = wrkMastService.selectById(workNo);
-                if (null != wrkMast) {
-                    workNo = workNo>=eNo ? sNo : workNo+1;
-                } else {
-                    break;
-                }
+        while (true) {
+            WrkMast wrkMast = wrkMastService.selectById(workNo);
+            if (null != wrkMast) {
+                workNo = workNo>=eNo ? sNo : workNo+1;
+            } else {
+                break;
             }
-            if (workNo > 0){
-                wrkLastno.setWrkNo(workNo);
-                wrkLastnoService.updateById(wrkLastno);
-            }
+        }
+        if (workNo > 0){
+            wrkLastno.setWrkNo(workNo);
+            wrkLastnoService.updateById(wrkLastno);
         }
         if (workNo == 0) {
             throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");

--
Gitblit v1.9.1