From 57c62dd3e7d398e253c2db549b819d020040b1a5 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期日, 29 三月 2020 20:49:17 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
index c6ddc54..a96f8a8 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
@@ -83,7 +83,7 @@
}
MaintainField maintainField = getMaintainFieldByMaintain(maintainId);
- if (maintainField == null && Constant.Default.equalsIgnoreCase(maintainField.getId())) {
+ if (maintainField == null || Constant.Default.equalsIgnoreCase(maintainField.getId())) {
fieldList = this.selectList(new EntityWrapper<SysField>().eq("table_name", maintain.getTableName()).isNull("maintain_field_id").orderBy("order_no"));
return fieldList;
@@ -116,7 +116,7 @@
@Override
public MaintainField getMaintainFieldByMaintain(String maintainId) {
- MaintainField maintainField;
+ MaintainField maintainField = null;
List<SysField> fieldList = null;
if (StringUtils.isEmpty(maintainId)) {
@@ -126,8 +126,18 @@
if (maintain == null) {
return null;
}
+ List<MaintainField> subList = maintainFieldService.selectList(new EntityWrapper<MaintainField>().eq("maintain_id", maintainId).orderBy("order_no desc, create_time desc"));
+ subList.sort(new Comparator<MaintainField>() {
+ @Override
+ public int compare(MaintainField o1, MaintainField o2) {
- maintainField = maintainFieldService.selectOne(new EntityWrapper<MaintainField>().eq("maintain_id", maintainId).orderBy("order_no desc, create_time desc"));
+ return o2.getOrderNo().compareTo(o1.getOrderNo());
+ }
+ });
+ if (!subList.isEmpty()) {
+ maintainField = subList.get(0);
+ }
+
if (maintainField == null) {
//瀵瑰簲鐗堟湰鎵句笉鍒� 寰�鍓嶆壘
String maintainFieldId = maintainFieldMapper.getMappedMatintainId(DbUtils.quotedStr(maintain.getTableName()), maintain.getOrderNo());
--
Gitblit v1.8.0