From c9fbfd1511cfee19ec017bedd8160739ae5afc98 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 26 十一月 2023 14:05:26 +0800
Subject: [PATCH] 修复关键属性重复,如果是当前分类则返回编码,如果是其他分类则给出提示

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   11 +++++++++--
 1 files changed, 9 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 4e0bb26..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
@@ -144,7 +144,6 @@
 			baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
 			Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
 			if(revisionseq!=null){
-
 				baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
 			}
 
@@ -157,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