|
|
@@ -60,7 +60,10 @@ public class StudentService {
|
|
|
List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
|
|
|
Set<Long> subjectIdSet;
|
|
|
if (!directed) {
|
|
|
- if(null != subjectId && subjectId > 0) {
|
|
|
+ if(null == subjectId) {
|
|
|
+ return list;
|
|
|
+ }
|
|
|
+ if(subjectId > 0) {
|
|
|
Integer userSubjectId = SecurityUtils.getLoginUser().getUser().getSelectSubject();
|
|
|
if(null != userSubjectId) {
|
|
|
subjectIdSet = Sets.newHashSet(userSubjectId.longValue());
|