|
@@ -1,5 +1,6 @@
|
|
|
package com.persagy.dmp.rwd.service;
|
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
@@ -104,7 +105,8 @@ public class ObjectInstanceCreateService extends BaseService {
|
|
|
entity.setVirtualInfoCodes(getStringList(param, RwdConstants.OBJECT_VIRTUAL_INFO_CODES));
|
|
|
entity.setInfos(JsonNodeFactory.instance.objectNode());
|
|
|
entity.setCreateTime(new Date());
|
|
|
- entity.setCreateUser(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER));
|
|
|
+ entity.setCreateUser(StrUtil.isNotBlank(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER))
|
|
|
+ ?JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER):DmpParameterStorage.getUserId());
|
|
|
entity.setCreateApp(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_APP, orgParam.appId));
|
|
|
} else {
|
|
|
QObjectInstance qt = QObjectInstance.objectInstance;
|
|
@@ -125,7 +127,8 @@ public class ObjectInstanceCreateService extends BaseService {
|
|
|
entity.setVirtualInfoCodes(getStringList(param, RwdConstants.OBJECT_VIRTUAL_INFO_CODES));
|
|
|
entity.setInfos(JsonNodeFactory.instance.objectNode());
|
|
|
entity.setCreateTime(new Date());
|
|
|
- entity.setCreateUser(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER));
|
|
|
+ entity.setCreateUser(StrUtil.isNotBlank(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER))
|
|
|
+ ?JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER):DmpParameterStorage.getUserId());
|
|
|
entity.setCreateApp(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_APP, orgParam.appId));
|
|
|
} else {
|
|
|
// 数据已存在
|
|
@@ -151,7 +154,8 @@ public class ObjectInstanceCreateService extends BaseService {
|
|
|
entity.setValid(RwdConstants.OBJECT_VALID_VALID);
|
|
|
}
|
|
|
entity.setUpdateTime(new Date());
|
|
|
- entity.setUpdateUser(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_USER));
|
|
|
+ entity.setUpdateUser(StrUtil.isNotBlank(JacksonMapper.getString(param, RwdConstants.OBJECT_UPDATE_USER))
|
|
|
+ ?JacksonMapper.getString(param, RwdConstants.OBJECT_UPDATE_USER):DmpParameterStorage.getUserId());
|
|
|
entity.setUpdateApp(JacksonMapper.getString(param, RwdConstants.OBJECT_CREATE_APP, orgParam.appId));
|
|
|
}
|
|
|
}
|