From 6bccfd2132c8523b5ebeffa772a8fa0e784d8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 10:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 0430da1..3b51169 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -6,6 +6,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import java.lang.reflect.Field;
import java.math.BigDecimal;
@@ -49,7 +50,10 @@
baseModel.setLastR("1");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
- baseModel.setOwner("1");
+ if(Func.isBlank(baseModel.getOwner())){
+ // 璁剧疆鎵�鏈夎��
+ baseModel.setOwner(AuthUtil.getUserId().toString());
+ }
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
@@ -82,8 +86,6 @@
return (T)baseModel;
}
-
-
/**
* 鏂板鏃跺～鍏呴粯璁ゅ��
* @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
@@ -96,13 +98,16 @@
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
baseModel.setOid(dataMap.getOrDefault("OID",""));
- String createTime=dataMap.getOrDefault("CREATETIME","");
+ Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+ String createTime= createTimeObj.toString();
baseModel.setCreateTime(chageStringToDate(createTime));
baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
- String lastModifyTime=dataMap.getOrDefault("LASTMODIFYTIME","");
+ Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
+ String lastModifyTime= lastModifyTimeObj.toString();
baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
- String ts=dataMap.getOrDefault("TS","");
+ Object tsObj=dataMap.getOrDefault("TS","");
+ String ts= tsObj.toString();
baseModel.setTs(chageStringToDate(ts));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
//鐢ㄦ埛id
--
Gitblit v1.9.3