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/controller/AssembleController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/AssembleController.java b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
index 962c643..e4dee9f 100644
--- a/src/main/java/com/highdatas/mdm/controller/AssembleController.java
+++ b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
@@ -386,8 +386,11 @@
JSONObject o = (JSONObject) JSON.toJSON(record);
SysAssembleParams sysAssembleParams = paramsService.selectOne(eq);
- String val = sysAssembleParams.getVal();
- o.fluentPut("nextTime", val);
+ if(sysAssembleParams != null) {
+ String val = sysAssembleParams.getVal();
+ o.fluentPut("nextTime", val);
+ }
+
String realMenuId = record.getMenuId();
if (!StringUtils.isEmpty(realMenuId)) {
--
Gitblit v1.8.0