|
@@ -119,7 +119,14 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
|
|
subjects = new ArrayList<Subject>();
|
|
subjects = new ArrayList<Subject>();
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(userExtSubjectIds)){
|
|
if(StringUtils.isNotBlank(userExtSubjectIds)){
|
|
- subjects.addAll(findBySubjectByIdList(userExtSubjectIds));
|
|
|
|
|
|
+ List<Long> idList = subjects.stream().map(t -> t.getId()).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ List<Subject> extSubjectList = findBySubjectByIdList(userExtSubjectIds);
|
|
|
|
+ for(Subject ext : extSubjectList){
|
|
|
|
+ if(!idList.contains(ext.getId())){
|
|
|
|
+ subjects.add(ext);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
List<Long> parentIds = subjects.stream().map(Subject::getParentSubjectId).collect(Collectors.toList());
|
|
List<Long> parentIds = subjects.stream().map(Subject::getParentSubjectId).collect(Collectors.toList());
|