From a475adaeba4b9954ed19f5ece005e95971ed4b0e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 04 二月 2024 13:03:38 +0800
Subject: [PATCH] 内外网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 75dd158..98ed589 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -202,11 +202,11 @@
if (baseModelMap.containsKey(applyId)) {
baseModel = baseModelMap.get(applyId);
Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
- String classOid=dataValueMap.getOrDefault("CODECLSFID","");
+ /*String classOid=baseModel.getId();
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
customCoding=10+customCoding;
- }
+ }*/
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
@@ -343,10 +343,10 @@
if (baseModelMap.containsKey(applyId)) {
BaseModel baseModel = baseModelMap.get(applyId);
//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
- String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+ /*String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
- }
+ }*/
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
baseModel.getData().put("GROUPCODE", customCoding);
@@ -864,7 +864,7 @@
* */
private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
try {
- String curUserName ="28201728"; //AuthUtil.getUser().getUserName();
+ String curUserName =AuthUtil.getUser().getUserName();
//鐢宠鐨勬暟鎹�
List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
for (BaseModel dataBusinessObject : codeWupins) {
--
Gitblit v1.9.3