Commit 97a6d3cd authored by liuyang's avatar liuyang

fixed bug:企业购领取会员查询接口

parent 549a2175
...@@ -135,7 +135,6 @@ public class MyEnterpriseController { ...@@ -135,7 +135,6 @@ public class MyEnterpriseController {
@SysLog("企业购中领取会员历史记录列表") @SysLog("企业购中领取会员历史记录列表")
public PageResult<OrgUserReceiveRecordModel> orgReceiveVIPHistory(@RequestBody QueryReceiveHistoryModel model){ public PageResult<OrgUserReceiveRecordModel> orgReceiveVIPHistory(@RequestBody QueryReceiveHistoryModel model){
model.setUserId(null); model.setUserId(null);
model.setOrgId(userService.getUserEnterpriesId(UserContext.getUserId()));
return orgUserReceiveRecordService.queryPageList(model); return orgUserReceiveRecordService.queryPageList(model);
} }
......
...@@ -11,4 +11,6 @@ public class OrgUserReceiveRecordModel { ...@@ -11,4 +11,6 @@ public class OrgUserReceiveRecordModel {
private Integer count; private Integer count;
private String courseName; private String courseName;
private LocalDateTime createTime; private LocalDateTime createTime;
private Long userId;
private String name;
} }
...@@ -6,10 +6,19 @@ ...@@ -6,10 +6,19 @@
SELECT r.product_type, SELECT r.product_type,
r.count, r.count,
r.create_time, r.create_time,
c.`name` course_name c.`name` course_name,
r.user_id,
ue.`name`
FROM org_user_receive_record r FROM org_user_receive_record r
LEFT JOIN course c on r.course_id = c.id LEFT JOIN course c on r.course_id = c.id
WHERE r.user_id = #{p.userId} INNER JOIN user_ext ue on ue.user_id = r.user_id
WHERE 1 = 1
<if test="p.userId != null">
and r.user_id = #{p.userId}
</if>
<if test="p.orgId != null">
and r.org_id = #{p.orgId}
</if>
<if test="p.productType != null"> <if test="p.productType != null">
AND r.product_type = #{p.productType} AND r.product_type = #{p.productType}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment