pengcheng недель назад: 3
Родитель
Сommit
3651dca775

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

@@ -23,7 +23,7 @@ public class ActivityShopSaleBo {
     @NotNull(message = "活动id不能为空", groups = {QueryGroup.class})
     private Long activityId;
 
-    @NotNull(message = "代理商id不能为空", groups = {QueryGroup.class})
+    @ApiModelProperty(value = "代理商id", required = true)
     private Long agentId;
 
     /**

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

@@ -237,7 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_activity_agent aa ON r.activity_id = aa.activity_id
         WHERE r.activity_id = #{bo.activityId}
           AND r.status = 0
-        <if test="bo.agentId != null ">
+        <if test="bo.agentId != null">
             AND aa.agent_id = #{bo.agentId}
         </if>
         <if test="bo.agentName != null and bo.agentName != ''">