From 2f1d2636adbd763d729c5836aa720fe8844ba9f3 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期五, 14 七月 2023 18:01:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 984f76a..95e3f5a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -780,8 +780,13 @@
 	 * @param rule 瑙勫垯鐨勫唴瀹�
 	 * @return 杞崲鍚庣殑
 	 */
-	private String getValueByFormulaForCBO(BaseModel cbo,String rule){
-		Map<String, Object> dataMap = BeanUtils.beanToMap(cbo);
+	private String getValueByFormulaForCBO(BaseModel cbo,String rule)  {
+		Map<String, Object> dataMap = null;
+		try{
+			dataMap = VciBaseUtil.convertBean2Map(cbo);
+		}catch(Exception e){
+			throw new VciBaseException("mapToBeanError:"+e);
+		}
 		Map<String, String> map = new HashMap<String, String>();
 		for (String i : dataMap.keySet()) {
 			map.put(i, String.valueOf(dataMap.get(i)));

--
Gitblit v1.9.3