소스 검색

需求:调整dmp-rwd的创建用户的取值

lijie 3 년 전
부모
커밋
0f721851e1

+ 7 - 3
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/ObjectInstanceCreateService.java

@@ -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));
 				}
 			}

+ 4 - 0
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/ObjectInstanceUpdateService.java

@@ -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;
@@ -167,6 +168,9 @@ public class ObjectInstanceUpdateService extends BaseService {
 		if (updateUser != null) {
 			entity.setUpdateUser(updateUser);
 		}
+		if (null == updateUser && StrUtil.isNotBlank(DmpParameterStorage.getUserId())) {
+			entity.setUpdateUser(DmpParameterStorage.getUserId());
+		}
 		String updateApp = JacksonMapper.getString(param, RwdConstants.OBJECT_UPDATE_APP, orgParam.appId);
 		if (updateApp != null) {
 			entity.setUpdateApp(updateApp);

+ 3 - 0
dmp-rwd/src/main/java/com/persagy/dmp/rwd/service/RelationInstanceService.java

@@ -106,6 +106,9 @@ public class RelationInstanceService extends BaseService {
             if (entity.getCreateApp() == null) {
                 entity.setCreateApp(DmpParameterStorage.getAppId());
             }
+            if (entity.getCreateUser() == null) {
+                entity.setCreateApp(DmpParameterStorage.getUserId());
+            }
             // 判断是否已存在
             QRelationInstance rt = QRelationInstance.relationInstance;
             BooleanExpression exp = rt.groupCode.eq(entity.getGroupCode())