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

代码还原

This commit is contained in:
liang.chao 2024-11-23 11:44:49 +08:00
parent 4576c616d6
commit f42484d685
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -159,19 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.material.device.domain.vo.DevInfoVo"> <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,
c.auth_phone, mt1.type_name as device_name,
mt2.type_name as group_name, mt3.type_name as type_name,
col.id as collect_id, h.search_num
from ma_dev_info d
left join bm_company_info c on d.own_co = c.company_id
left join ma_user_collect col on d.ma_id = col.ma_id
left join ma_hot_search h on d.ma_id = h.ma_id
left join ma_type t on d.type_id = t.type_id
left join ma_type mt1 on d.type_id = mt1.type_id
left join ma_type mt2 on mt1.parent_id = mt2.type_id
left join ma_type mt3 on mt2.parent_id = mt3.type_id
where d.ma_id = #{maId} and d.is_active='1'
SELECT SELECT
d.ma_id as maId, d.ma_id as maId,
d.code as code, d.code as code,
@ -196,7 +183,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_company_info c ON d.own_co = c.company_id LEFT JOIN bm_company_info c ON d.own_co = c.company_id
where where
d.is_active='1' and d.ma_id = #{maId} d.is_active='1' and d.ma_id = #{maId}
>>>>>>> origin/master
</select> </select>
<select id="getFilesByMaId" parameterType="Long" resultType="com.bonus.common.biz.domain.SysFile"> <select id="getFilesByMaId" parameterType="Long" resultType="com.bonus.common.biz.domain.SysFile">