he2802 1 năm trước cách đây
mục cha
commit
53cca8937b

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -219,5 +219,5 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;
 	private Long projectId;
-
+	private Long majorId;
 }

+ 12 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -824,6 +824,12 @@
         AND s.pay_status in (2,3,4)
         AND o.`status` = 1
         AND g.goods_type = 8
+        <if test="status != null and status.size()!=0 ">
+            AND g.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="userId != null and userId !=''">
             AND o.user_id = #{userId}
         </if>
@@ -930,6 +936,12 @@
         AND s.pay_status in (2,3,4)
         AND o.`status` = 1
         AND g.goods_type = 6
+        <if test="status != null and status.size()!=0 ">
+            AND g.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="userId != null and userId !=''">
             AND o.user_id = #{userId}
         </if>