考生关联科目处理

ie-admin/src/main/java/com/ruoyi/web/service/StudentService.java

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