From fa24d347d4c5a796297184f9957b0582dc52c66e Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 14 二月 2020 14:34:00 +0800
Subject: [PATCH] init 2/14
---
src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
index f7c8f61..fc3971f 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MaintainServiceImpl.java
@@ -45,6 +45,7 @@
MasterDataService masterDataService;
@Autowired
ISysFieldService fieldService;
+
@Autowired
MaintainMapper maintainMapper;
@@ -306,16 +307,22 @@
continue;
}
ActivitiStatus status = flows.getStatus();
- if (status.equals(ActivitiStatus.open)) {
+ if (status.equals(ActivitiStatus.open) && nowMaintain == null) {
nowMaintain = maintain;
- break;
+ continue;
+ }
+ if (!status.equals(ActivitiStatus.open) && nowMaintain != null){
+ nowMaintain = null;
}
}
if (nowMaintain == null) {
nowMaintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", tableName).orderBy("version desc"));
}
int orderNo = nowMaintain.getOrderNo();
- orderNo--;
+ Maintain nowVersion = getNowVersion(tableName);
+ if (nowVersion != null && nowVersion.getOrderNo() == orderNo) {
+ orderNo--;
+ }
Maintain maintain = selectOne(new EntityWrapper<Maintain>().eq("table_name", nowMaintain.getTableName()).eq("order_no", orderNo));
return maintain;
}
--
Gitblit v1.8.0