Merge branch 'dev-api' into dev

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/StudentService.java

@@ -84,18 +84,27 @@ public class StudentService {
 
     public Student selectStudentByUserId(Long userId) {
         SysUser sysUser = userMapper.selectUserById(userId);
-        // 屏蔽密码
-        sysUser.setPassword("");
         Student student = new Student();
-        BeanUtils.copyProperties(sysUser, student);
-        student.setMajor(getMajorByDeptId(sysUser.getDeptId()));
-        // logger.info(Objects.requireNonNull(student.toString()));
+        // todo:用户角色判断。
+        // 屏蔽密码
+        if (Objects.nonNull(sysUser)) {
+            sysUser.setPassword("");
+            BeanUtils.copyProperties(sysUser, student);
+            Major m = getMajorByDeptId(sysUser.getDeptId());
+            if (Objects.nonNull(m)) {
+                student.setMajor(m);
+            }
+            // logger.info(Objects.requireNonNull(student.toString()));
+        }
         return student;
     }
 
-    public Major getMajorByDeptId(long deptId) {
+    public Major getMajorByDeptId(Long deptId) {
         AddOnDept a = addOnDeptService.selectAddOnDeptByDeptId(deptId);
-        Major m = majorService.selectMajorByMajorId(a.getMajorId());
+        Major m = null;
+        if (Objects.nonNull(a)) {
+            m = majorService.selectMajorByMajorId(a.getMajorId());
+        }
         return m;
     }
 }