From 8f0bb9dd15589861df5574890976ad4c46490a8c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 九月 2023 17:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 0119b7a..b0163b3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -437,18 +437,11 @@
//澶囨敞
cbo.setDescription(orderDTO.getDescription());
cboList.add(cbo);
-//
-// cboList.add(cbo);
+
List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
-
-// List<String> charList = new ArrayList<>();
-// for (BaseModel baseModel : cboList) {
-// charList.add(baseModel.getId());
-// }
batchSaveSelectChar(templateVO, cboList);
return codeList.size() > 0 ? codeList.get(0) : "";
-// return null;
}
/**
@@ -3919,7 +3912,6 @@
treeWrapperOptions.setParentOid(queryObject.getParentOid());
return revisionModelUtil.doList2Trees(codeClassifies, treeWrapperOptions, null);
}
-
@Override
public boolean checkUnAttrUnEdit(String attrName) {
--
Gitblit v1.9.3