接口修改

ruoyi-system/src/main/java/com/ruoyi/clock/domain/bo/ActivityShopSaleBo.java

@@ -38,4 +38,7 @@ public class ActivityShopSaleBo {
     @ApiModelProperty("门店名称")
     private String shopName;
 
+    @ApiModelProperty(value = "店铺id", required = true)
+    private Long shopId;
+
 }

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -276,7 +276,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE r.activity_id = #{bo.activityId}
           AND r.status = 0
         <if test="bo.agentId != null">
-            AND aa.agent_id = #{bo.agentId}
+            AND e.agent_id = #{bo.agentId}
+        </if>
+        <if test="bo.shopId != null">
+            AND s.shop_id = #{bo.shopId}
         </if>
         <if test="bo.agentName != null and bo.agentName != ''">
             AND ag.agent_name LIKE CONCAT('%', #{bo.agentName}, '%')