From 9e08d54b02b9ebb08389f0ca1dbe3c5518a2b34e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 16 十一月 2023 10:28:47 +0800
Subject: [PATCH] 主题库-枚举下拉清空
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 27 +++++++++++++++++----------
1 files changed, 17 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..4e0bb26 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,24 +42,29 @@
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");
baseModel.setLastV("1");
baseModel.setRevisionSeq(1);
+ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
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 +83,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 +134,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 +156,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