From e8f204951ed48925965177c4f2e09c73675290e1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 22:56:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 a004b76..ab54355 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
@@ -42,10 +42,10 @@
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
baseModel.setRevisionOid(VciBaseUtil.getPk());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ // 鐢ㄦ埛id
+ // String userId = AuthUtil.getUserId().toString();
baseModel.setBtmname(btmName);
- baseModel.setCreator(userId);
+ baseModel.setCreator(AuthUtil.getUser().getAccount());
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
@@ -55,11 +55,15 @@
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(AuthUtil.getUserId().toString());
}
+
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(userId);
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -78,9 +82,11 @@
try {
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
- baseModel.setLastModifier(userId);
+ // 鐢ㄦ埛id
+ // String userId = AuthUtil.getUserId().toString();
+ // 瑕佹眰鏀规垚璐﹀彿
+ String account = AuthUtil.getUserAccount();
+ baseModel.setLastModifier(account);
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -127,8 +133,8 @@
baseModel.setTs(chageStringToDate(ts));
}
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- //鐢ㄦ埛id
- String userId = AuthUtil.getUserId().toString();
+ //鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
+ // String userId = AuthUtil.getUserId().toString();
baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
@@ -149,7 +155,7 @@
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- baseModel.setLastModifier(userId);
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
}catch (VciBaseException e){
e.printStackTrace();
--
Gitblit v1.9.3