bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-06 15:00:01 +08:00
parent 468956451c
commit cb0a772198
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
View File

@ -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) {

2
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -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>