From c007f0ca1785db093d48f4846cda82fe8e955765 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 27 五月 2020 09:59:29 +0800
Subject: [PATCH] merage
---
src/main/java/com/highdatas/mdm/util/pool/MqMessage.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java b/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
index 543fbec..b05dc65 100644
--- a/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
+++ b/src/main/java/com/highdatas/mdm/util/pool/MqMessage.java
@@ -7,6 +7,7 @@
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.List;
@@ -87,6 +88,9 @@
String fields = fieldByMaintain.stream().map(sysField -> sysField.getField()).collect(Collectors.joining(Constant.COMMA));
String filter = DbUtils.masterAuthorService.getFilter(user, maintain.getId());
+ if (StringUtils.isEmpty(filter)) {
+ filter = Constant.WHERE_DEFAULT;
+ }
String content;
if (increment) {
String maintainTableName = maintain.getTableName();
@@ -95,6 +99,10 @@
page.setPageSize(mqEntity.getPageSize().get());
page.setPageNo(mqEntity.getPageNo().get());
List<Map<String, Object>> maps = DbUtils.maintainDetailMapper.selectMaintainDetail(fields, tempTableName, maintain.getId(), filter, page.getLimitSQL());
+
+ Map<String, AntianaphylaxisResult> helpfulField = DbUtils.antianaphylaxisClient.getHelpfulField(fields, maintainTableName);
+ DbUtils.antianaphylaxisClient.fixMasterData(maps,helpfulField);
+
JSONObject object = new JSONObject();
object.fluentPut("total", page.getRecordCount());
object.fluentPut("size", page.getPageSize());
--
Gitblit v1.8.0