From cb0a77219888c0bdc9ec8a529e3b28f746bfa9c3 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Wed, 6 Dec 2023 15:00:01 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java   | 2 +-
 .../zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 81d564c..9bd700f 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -52,7 +52,7 @@ public class DevInfoServiceImpl implements IDevInfoService
     {
         DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId);
         List<SysFile> files = devInfoMapper.getFilesByMaId(maId);
-        if (!CollectionUtils.isEmpty(files)) {
+        if (!CollectionUtils.isEmpty(files) && files.get(0) != null) {
             List<String> picList = new ArrayList();
             for (SysFile file : files) {
                 if (file.getDicId() == ASPECT_PICTURE) {
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
index efc9af6..4368085 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
         select o.*,d.phone as order_phone,d.ma_id,co.company_name as supplier_company
         from ma_order_info o
-        left join ma_order_details d on o.order_id=d.id
+        left join ma_order_details d on o.order_id=d.order_id
         left join bm_company_info co on o.supplier=co.company_id
         <where>  
             <if test="orderId != null "> and o.order_id = #{orderId}</if>