H3C

src/main/java/cn/com/uitech/authorization/service/impl/IntegrateServiceImpl.java

@@ -950,11 +950,13 @@ public class IntegrateServiceImpl implements IntegrateService {
                                 Object data = map1.get("data");
                                 Object data2 = JSONObject.toJSON(data);
                                 Map<String, Object> map2 = (Map<String, Object>) data2;
+                                if(!ObjectUtils.isEmpty(map2)){
+                                    cpnList.setSkuCode((String) map2.get("skuCode"));
+                                    cpnList.setSkuName((String) map2.get("skuName"));
+                                    cpnList.setPatern("CTO");
+                                }
                                 result.setCode(code);
                                 result.setMsg((String) map1.get("msg"));
-                                cpnList.setSkuCode((String) map2.get("skuCode"));
-                                cpnList.setSkuName((String) map2.get("skuName"));
-                                cpnList.setPatern("CTO");
                                 result.setData(configSkuInfo);
                             }
                         }

src/main/resources/mapper/CharacteristicMapper.xml

@@ -118,7 +118,7 @@
     </insert>
 
     <select id="findByCharacteristicName" resultType="cn.com.uitech.authorization.pojo.entity.Characteristic">
-        select * from super_characteristic_info where unis_sales_c_name = #{characteristicName} and super_bom_code = #{superBomCode}
+        select * from super_characteristic_info where characteristic_name = #{characteristicName} and super_bom_code = #{superBomCode}
     </select>
 
     <select id="getNameByCode" resultType="java.lang.String">

src/main/resources/mapper/CharacteristicValueMapper.xml

@@ -8,6 +8,7 @@
         FROM (
         SELECT
         a.*,
+        b.*,
         c.is_State as bomStatus
         FROM super_characteristic_value_info a
         LEFT JOIN super_characteristic_info b ON a.Characteristic_Code=b.Characteristic_Code