Commit 891b645d authored by liuyang's avatar liuyang

fixed bug

parent 14ae81d6
...@@ -52,18 +52,13 @@ public class CourseConsumeRecordService extends ServiceImpl<CourseConsumeRecordM ...@@ -52,18 +52,13 @@ public class CourseConsumeRecordService extends ServiceImpl<CourseConsumeRecordM
/** /**
* 批量删除观看记录 * 批量删除观看记录
* @param ids * @param userId
* @param courseIds
*/ */
public void removeBatch(List<Long> ids) { public void removeByCourseIds(Long userId,List<Long> courseIds) {
for (Long id : ids){
CourseConsumeRecordPO po = getById(id);
if (po != null){
remove(Wrappers.<CourseConsumeRecordPO>lambdaQuery() remove(Wrappers.<CourseConsumeRecordPO>lambdaQuery()
.eq(CourseConsumeRecordPO::getUserId,po.getUserId()) .eq(CourseConsumeRecordPO::getUserId,userId)
.eq(CourseConsumeRecordPO::getCourseId,po.getCourseId()) .in(CourseConsumeRecordPO::getCourseId,courseIds));
.eq(CourseConsumeRecordPO::getChapterId,po.getChapterId()));
}
}
} }
/** /**
......
...@@ -16,7 +16,6 @@ import com.qkdata.common.base.exception.BusinessException; ...@@ -16,7 +16,6 @@ import com.qkdata.common.base.exception.BusinessException;
import com.qkdata.common.base.model.PageResult; import com.qkdata.common.base.model.PageResult;
import com.qkdata.common.base.model.Result; import com.qkdata.common.base.model.Result;
import com.qkdata.common.util.UserContext; import com.qkdata.common.util.UserContext;
import com.sun.org.apache.xpath.internal.operations.Bool;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.Logical;
...@@ -136,8 +135,8 @@ public class UserCenterController { ...@@ -136,8 +135,8 @@ public class UserCenterController {
@PostMapping("/consumeRecord/delete") @PostMapping("/consumeRecord/delete")
@RequiresRoles(value = {BizConstants.ROLE_USER,BizConstants.ROLE_ENTERPRISE_ADMIN},logical = Logical.OR) @RequiresRoles(value = {BizConstants.ROLE_USER,BizConstants.ROLE_ENTERPRISE_ADMIN},logical = Logical.OR)
@SysLog("删除观看记录列表") @SysLog("删除观看记录列表")
public Result<String> consumeRecordList(@RequestBody List<Long> ids){ public Result<String> consumeRecordList(@RequestBody List<Long> courseIds){
courseConsumeRecordService.removeBatch(ids); courseConsumeRecordService.removeByCourseIds(UserContext.getUserId(),courseIds);
return Result.succeed("ok"); return Result.succeed("ok");
} }
@ApiOperation("用户观看某课程的记录") @ApiOperation("用户观看某课程的记录")
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.qkdata.biz.management.mapper.CourseConsumeRecordMapper"> <mapper namespace="com.qkdata.biz.management.mapper.CourseConsumeRecordMapper">
<select id="queryUserCourseRecordLast" resultType="com.qkdata.biz.web.vo.CourseConsumeRecordModel"> <select id="queryUserCourseRecordLast" resultType="com.qkdata.biz.web.vo.CourseConsumeRecordModel">
SELECT r.id, SELECT r.id,
r.user_id, r.user_id,
......
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