From 37dab8c3b3a9072d5fb9475e3c671ca591231505 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 23:07:34 +0800
Subject: [PATCH] 统一设置默认值赋值bug修复
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json | 36 ++++++++++++------------------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 3 ++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 4 ++++
3 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
index 2df8208..a83e07e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/xxx.json
@@ -3,34 +3,18 @@
"classifys": {
"classify": [
{
- "classCode": "020201",
+ "classCode": "050101",
"fullclsfNamePath": "",
"library": "wupin",
"sections": {
"section": [
{
- "name": "鍥哄畾鐮佹2",
- "value": ""
+ "name": "鍥哄畾鐮佹",
+ "value": "A"
},
{
- "name": "鍒嗙被鐮佹鐖�",
+ "name": "寮曠敤鐮佹",
"value": "001"
- },
- {
- "name": "鍒嗙被鐮佹瀛�",
- "value": "0012"
- },
- {
- "name": "鍙彉鐮佹",
- "value": ""
- },
- {
- "name": "test",
- "value": "7E1C92A2-9B6F-4DB3-48C7-F42D1304E36B"
- },
- {
- "name": "娴佹按鐮佹",
- "value": ""
}
]
},
@@ -42,18 +26,22 @@
"status": "Released",
"operate": "create",
"creator": "weidy",
- "prop": []
+ "prop": [{
+ "key": "name",
+ "text": "鍚嶇О",
+ "value": "鍗婂渾澶磋灪閽�"
+ }]
}
]
}
}
]
},
- "systemId": "MPM",
+ "systemId": "ERP",
"user": {
"ip": "192.168.0.1",
- "trueName": "llz",
- "userName": "llz"
+ "trueName": "weidy",
+ "userName": "weidy"
}
}
}
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 e1f4796..2652b9d 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
@@ -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.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index abbb1be..543b0a5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -3747,7 +3747,8 @@
}
}
CodeClassifyFullInfoBO newClassifyFullInfo= classifyFullInfoMap.get(cbo.getAttributeValue(CODE_CLASSIFY_OID_FIELD));
- List<CodeClassifyVO> classifyVOS = newClassifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
+ List<CodeClassifyVO> classifyVOS = newClassifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
+
int level = VciBaseUtil.getInt(attrVO.getClassifyInvokeLevel());
if (classifyVOS.size()>=level && level > 0 ) {
classifyVO = classifyVOS.get(level-1);
--
Gitblit v1.9.3