From 20ae109f6e2faabc057e70b0dbae13570c1020cd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 24 十月 2023 08:58:38 +0800
Subject: [PATCH] 修改创建人,最后修改人列存储信息为账号

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 2652b9d..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,8 +42,8 @@
 			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(AuthUtil.getUser().getAccount());
 			baseModel.setFirstR("1");
@@ -60,7 +60,7 @@
 			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());
@@ -82,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();
 		}
@@ -131,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",""));
@@ -153,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