From 5268a2b7dfa556bd6f5a2d5e446cea3ea9940c10 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 22 四月 2020 11:18:23 +0800
Subject: [PATCH] add 分发 master_author 添加字段 subscribe increment， 添加7个表 master_author_subscribe master_author_unactive sys_dispense_config sys_dispense_logs sys_view sys_view_join sys_view_logic
---
src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 4e23de4..a4e94ea 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/SysFieldServiceImpl.java
@@ -260,7 +260,7 @@
List subList = (List) list.stream().skip(page.getBeginRecordNo_1()).limit(page.getPageSize()).collect(Collectors.toList());
result.fluentPut("pages", page.getPageCount());
result.fluentPut("current", pageNo);
- result.fluentPut("passiveQueueSize", pageSize);
+ result.fluentPut("size", pageSize);
result.fluentPut("total", page.getRecordCount());
result.fluentPut("list", subList);
@@ -281,7 +281,7 @@
List<Object> subList = list.stream().skip(page.getBeginRecordNo_1()).limit(page.getPageSize()).collect(Collectors.toList());
result.fluentPut("pages", page.getPageCount());
result.fluentPut("current", pageNo);
- result.fluentPut("passiveQueueSize", pageSize);
+ result.fluentPut("size", pageSize);
result.fluentPut("total", page.getRecordCount());
result.fluentPut("list", subList);
@@ -371,6 +371,20 @@
}
@Override
+ public SysField getOneFieldByMaintain(String maintainId, String field) {
+ List<SysField> fieldByMaintain = getFieldByMaintain(maintainId);
+ if (fieldByMaintain == null || fieldByMaintain.isEmpty()) {
+ return null;
+ }
+ for (SysField sysField : fieldByMaintain) {
+ if (sysField.getField().equalsIgnoreCase(field)) {
+ return sysField;
+ }
+ }
+ return null;
+ }
+
+ @Override
public List<SysField> getFieldByMaintainField(String maintainId) {
if (StringUtils.isEmpty(maintainId)) {
return null;
--
Gitblit v1.8.0