From 6a6094e21fb7810a2354a535ab4fea49e2a0d064 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 24 七月 2023 15:12:45 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 c07bd0f..7fc0b61 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
@@ -1417,7 +1417,7 @@
             maps.stream().forEach(map -> {
                 Map<String, String> data = new HashMap<>();
                 for (String s : map.keySet()) {
-                    data.put(s.toLowerCase(Locale.ROOT), String.valueOf(map.get(s)));
+                    data.put(s.toLowerCase(Locale.ROOT), map.get(s)==null?null:String.valueOf(map.get(s)));
                 }
 //				map.forEach((key, value) -> {
 //					data.put(((String) key).toLowerCase(Locale.ROOT), String.valueOf(value));
@@ -2024,7 +2024,7 @@
         }
         R<BtmTypeVO> r = btmTypeClient.getDefaultAttrByBtmId(btmType);
         List<BtmTypeAttributeVO> attributes = r.getData().getAttributes();
-        if (r.getCode() != 200 || attributes.isEmpty()) {
+        if (!r.isSuccess() || attributes.isEmpty()) {
             return false;
         }
         return attributes.stream().anyMatch(item -> item.getId().equals(selectKey));
@@ -3475,7 +3475,7 @@
         //checkReferConfig(referConfigVO);
         //浣跨敤涓氬姟绫诲瀷鏌ヨ
         R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
-        if (allAttributeByBtmId.getCode() != 200) {
+        if (!allAttributeByBtmId.isSuccess()) {
             throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
         }
         if (Func.isEmpty(allAttributeByBtmId.getData())) {
@@ -3497,7 +3497,7 @@
         }
 
         R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
-        if (listR.getCode() != 200) {
+        if (!listR.isSuccess()) {
             throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
         }
         if (listR.getData().isEmpty()) {

--
Gitblit v1.9.3