From f31b1b0a442c83432de9bdf6bc4539bc68acaf6c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十月 2023 19:57:51 +0800
Subject: [PATCH] 修改从其他规则中克隆码段反馈信息错误的bug
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 00bc500..a415202 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -618,10 +618,13 @@
createList.add(newSecDO);
}
// 澶勭悊鍒嗙被鐮佹鐨刼id锛屽洜涓簅id鍏宠仈parentClassifyOid锛屼笌鐮佸�糲odeClassifyOid锛岀爜鍊煎張闇�瑕侀�氳繃鏃х殑鐮佹oid鏉ユ煡璇紝鎵�浠ヤ笉鑳界洿鎺ユ敼鍙榦id
- boolean resChangeAssn = changeParentOidAssnOid(codeClassifySec);
+ changeParentOidAssnOid(codeClassifySec);
// 灏嗗鐞嗚繃鐨勫垎绫荤爜娈典篃娣诲姞杩涜鍋氭柊澧炲鐞嗙殑鐮佹闆嗗悎涓�
createList.addAll(codeClassifySec);
- boolean resBoolean = saveBatch(createList);
+ boolean resBoolean = true;
+ if(!createList.isEmpty()){
+ resBoolean = saveBatch(createList);
+ }
// 鏈�缁堣瀛樺叆鐮佸�艰〃涓殑锛岀爜鍊煎璞�
List<CodeFixedValue> codeFixedDOValues = new ArrayList<>();
// 鏋勯�犵爜鍊煎璞★紝涓庣爜娈典富閿叧鑱斿叧绯伙紝浠ュ強鏀瑰彉鍥哄畾鐮佸�肩殑oid
@@ -633,9 +636,12 @@
codeFixedDOValues.add(item);
});
});
- // 鍏嬮殕鍥哄畾鐮佸��
- boolean resFixed = fixedValueService.saveBatch(codeFixedDOValues);
- return (resBoolean&&resFixed&&resChangeAssn) ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�");
+ boolean resFixed = true;
+ if(!codeFixedValueMaps.isEmpty()){
+ // 鍏嬮殕鍥哄畾鐮佸��
+ resFixed = fixedValueService.saveBatch(codeFixedDOValues);
+ }
+ return (resBoolean&&resFixed) ? R.data(resBoolean,"鍏嬮殕鐮佹淇℃伅鎴愬姛"):R.fail("鍏嬮殕鐮佹淇℃伅澶辫触锛�");
}
/**
--
Gitblit v1.9.3