|
|
@@ -14,6 +14,7 @@ package vip.xiaonuo.disk.controller;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.collection.CollStreamUtil;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
|
|
|
@@ -37,6 +38,7 @@ import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordAddParam;
|
|
|
import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordEditParam;
|
|
|
import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordIdParam;
|
|
|
import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordPageParam;
|
|
|
+import vip.xiaonuo.disk.param.ClassHourIdParam;
|
|
|
import vip.xiaonuo.disk.service.*;
|
|
|
import vip.xiaonuo.disk.vo.collect.ResourceCollectVo;
|
|
|
import vip.xiaonuo.disk.vo.comment.UserCommentVo;
|
|
|
@@ -262,7 +264,7 @@ public class ResourceRecordController {
|
|
|
Map deleteRelateParam=new HashMap();
|
|
|
deleteRelateParam.put("resourceRecord", courseAuditRecord.getId());
|
|
|
List<ResourceRecordUserRelate> deleteRelateList=resourceRecordUserRelateService.allList(deleteRelateParam);
|
|
|
- List<String> deleteRelateIdList=deleteRelateList.stream().map(ResourceRecordUserRelate::getId).collect(Collectors.toList());
|
|
|
+ List<String> deleteRelateIdList=CollStreamUtil.toList(deleteRelateList, ResourceRecordUserRelate::getId);
|
|
|
resourceRecordUserRelateService.deleteByIds(deleteRelateIdList);
|
|
|
if(StringUtils.isNotEmpty(courseAuditRecordEditParam.getAuthType()))
|
|
|
{
|
|
|
@@ -438,7 +440,9 @@ public class ResourceRecordController {
|
|
|
{
|
|
|
param.put("resourceRecord", req.getParameter("id"));
|
|
|
List<ResourceRecordUserRelate> userRelateList=resourceRecordUserRelateService.allList(param);
|
|
|
- result.put("userRelateList",userRelateList);
|
|
|
+// result.put("userRelateList",userRelateList);
|
|
|
+ List<String> userRelateIdList=CollStreamUtil.toList(userRelateList, ResourceRecordUserRelate::getUserId);
|
|
|
+ result.put("userRelateIdList",userRelateIdList);
|
|
|
}
|
|
|
}
|
|
|
|