|
|
|
@ -2,7 +2,6 @@ package com.ibeetl.jlw.web;
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
@ -41,9 +40,13 @@ import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.LinkedHashMap;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import static cn.jlw.util.CacheUserUtil.getStudent;
|
|
|
|
|
import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
|
|
|
|
|
import static com.ibeetl.admin.core.util.ExcelUtil.write;
|
|
|
|
|
|
|
|
|
@ -270,6 +273,12 @@ public class TeacherOpenCourseChatLogController extends BaseController {
|
|
|
|
|
if (!coreUser.isAdmin()) {
|
|
|
|
|
condition.setOrgId(coreUser.getOrgId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 学生身份过滤班级
|
|
|
|
|
if (coreUser.isStudent()) {
|
|
|
|
|
condition.setSchoolClassIds(getStudent().getClassId().toString());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PageQuery page = condition.getPageQuery();
|
|
|
|
|
// 为空则查询顶级
|
|
|
|
|
condition.setTeacherOpenCourseChatLogParentId(ObjectUtil.defaultIfNull(condition.getTeacherOpenCourseChatLogParentId(), 0L));
|
|
|
|
|