fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -218,15 +218,16 @@ public class CourseController extends BaseController {
     @GetMapping("/goodsBatchList")
     public AjaxResult<Map<String,Object>> goodsBatchList(CourseQueryBo bo) {
         Map<String,Object> map = new HashMap<>();
-        for(String tel : bo.getTelphoneList()){
+        for(CourseProgressQueryBo queryBo : bo.getTelphoneList()){
             User user = iUserService.getOne(new LambdaQueryWrapper<User>()
-                    .eq(User::getTelphone, tel).last("limit 1"));
+                    .eq(User::getTelphone, queryBo.getTelphone()).last("limit 1"));
             if(Validator.isEmpty(user)){
                 throw new CustomException("该用户不存在");
             }
             bo.setUserId(user.getUserId());
+            bo.setGoodsId(queryBo.getGoodsId());
             List<GoodsUserVo> list = iCourseService.goodsProgressList(bo);
-            map.put(tel,list);
+            map.put(bo.getTelphone()+"-"+bo.getGoodsId(),list);
         }
         return AjaxResult.success(map);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseProgressQueryBo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.course.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 课程分页查询对象 course
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("课程分页查询对象")
+public class CourseProgressQueryBo extends BaseEntity {
+
+
+	/** 商品Id */
+	@ApiModelProperty("商品Id")
+	private Long goodsId;
+
+	@ApiModelProperty("手机号码")
+	private String telphone;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -113,5 +113,5 @@ public class CourseQueryBo extends BaseEntity {
 	private String telphone;
 
 	@ApiModelProperty("手机号码")
-	private List<String> telphoneList;
+	private List<CourseProgressQueryBo> telphoneList;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -571,6 +571,9 @@
         <if test="orderGoodsId != null and orderGoodsId != ''">
             AND og.order_goods_id = #{orderGoodsId}
         </if>
+        <if test="goodsId != null and goodsId != ''">
+            AND og.goods_id = #{goodsId}
+        </if>
         order by o.create_time desc
     </select>
     <select id="courseList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultMap="CourseUserVo">