From bce3fcf05020405e33199706c3d91e9b9a71bd39 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 十二月 2023 12:42:05 +0800
Subject: [PATCH] 关键属性查重特殊字符转义添加

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 ab54355..383a2aa 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
@@ -51,6 +51,7 @@
 			baseModel.setLastR("1");
 			baseModel.setLastV("1");
 			baseModel.setRevisionSeq(1);
+			// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
 			if(Func.isBlank(baseModel.getOwner())){
 				// 璁剧疆鎵�鏈夎��
 				baseModel.setOwner(AuthUtil.getUserId().toString());
@@ -143,7 +144,6 @@
 			baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
 			Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
 			if(revisionseq!=null){
-
 				baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
 			}
 
@@ -156,7 +156,15 @@
 			baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
 			baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
 			baseModel.setLastModifier(AuthUtil.getUser().getAccount());
-
+			baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
+			baseModel.setName(dataMap.getOrDefault("NAME",""));
+			baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
+			baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
+			baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
+			Object secretgrade=dataMap.get("SECRETGRADE");
+			if(secretgrade!=null){
+				baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
+			}
 		}catch (VciBaseException e){
 			e.printStackTrace();
 		}

--
Gitblit v1.9.3