|
|
@@ -7,6 +7,7 @@ import com.google.common.collect.Maps;
|
|
|
import com.google.common.collect.Sets;
|
|
|
import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.enums.ExamType;
|
|
|
+import com.ruoyi.common.enums.SubjectType;
|
|
|
import com.ruoyi.common.utils.NumberUtils;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.dz.domain.DzClasses;
|
|
|
@@ -295,7 +296,9 @@ public class LearnTeacherService {
|
|
|
|
|
|
public List<TreeNode> getKnowledgeTree(String examineeType, Long subjectId, Set<Long> knowledgeIdSet, Long studentId) {
|
|
|
LearnKnowledgeTree ktCond = new LearnKnowledgeTree();
|
|
|
- ktCond.setSubjectId(subjectId);
|
|
|
+ if (null != subjectId && !subjectId.equals(100L)) {
|
|
|
+ ktCond.setSubjectId(subjectId);
|
|
|
+ }
|
|
|
ktCond.setExamineeTypes(examineeType);
|
|
|
List<LearnKnowledgeTree> ktList = learnKnowledgeTreeMapper.selectLearnKnowledgeTreeList(ktCond);
|
|
|
Map<Long, Integer[]> knowCountMap = null;
|