Merge remote-tracking branch 'origin/main'

bonus-business/src/main/java/com/bonus/business/controller/MaterialController.java

@@ -39,7 +39,7 @@ public class MaterialController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(TbPromotionMaterial tbPromotionMaterial) {
         try {
-            startPage();
+//            startPage();
             List<TbPromotionMaterial> list = service.selectTbPromotionMaterialList(tbPromotionMaterial);
             return getDataTable(list);
         } catch (Exception e) {

bonus-business/src/main/java/com/bonus/business/domain/TbPromotionMaterial.java

@@ -13,7 +13,7 @@ import java.util.stream.IntStream;
 
 /**
  * 宣传物料信息对象 tb_promotion_material
- * 
+ *
  * @author 黑子
  * @date 2025-09-10
  */
@@ -76,6 +76,12 @@ public class TbPromotionMaterial extends BaseEntity
     /** 文件地址 */
     private String filePath;
 
+    private String fileDownloadPath;
+
+    private String imageName;
+
+    private String fileName;
+
     /** 文件 */
     private List<TbPromotionMaterialFiles> files;
 

bonus-business/src/main/resources/mapper/business/MaterialScreenMapper.xml

@@ -5,7 +5,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.business.mapper.MaterialScreenMapper">
 
     <select id="getMaterialList" resultType="com.bonus.business.domain.TbPromotionMaterial">
-
         select
         aaa.name,
         aaa.image,
@@ -14,9 +13,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         aaa.type_id,
         aaa.type_name,
         bbb.file_type,
-        bbb.file_path
+        bbb.file_path,
+        ccc.original_name as imageName,
+        bbb.original_name as fileName,
+        bbb.file_path as fileDownloadPath
         from tb_promotion_material aaa
         left join tb_promotion_material_files bbb on aaa.id = bbb.material_id  and bbb.type_id = '2' and bbb.del_flag = '0'
+        left join tb_promotion_material_files ccc on aaa.id = ccc.material_id  and ccc.type_id = '1' and ccc.del_flag = '0'
         where aaa.del_flag = '0'
         <if test="name != null and name != ''">
             and aaa.name like concat('%',#{name},'%')
@@ -31,4 +34,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     </select>
-</mapper>
+</mapper>