Merge branch 'master' of https://git.czcyedu.com/huoran/msdw_tms

src/main/java/com/msdw/tms/controller/UserInfoController.java

@@ -69,7 +69,7 @@ public class UserInfoController implements UserInfoControllerApi {
 
         //新增学生
         StudentVo studentVo = new StudentVo();
-        studentVo.setUserId(userInfoEntity.getUserId());
+
         studentVo.setRoleId(Integer.valueOf(userInfoEntity.getRoleId()));
         studentVo.setSchoolId(schoolId);
         studentVo.setIsdel(0);
@@ -92,7 +92,7 @@ public class UserInfoController implements UserInfoControllerApi {
             return R.error(400,"添加用户信息失败");
         }
 //        userInfoEntity.setUserId(userId);
-
+        studentVo.setUserId(userInfoEntity.getUserId());
         return studentService.addStudentInfo(studentVo);
     }
 

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -132,7 +132,7 @@
                sum(timeSum) AS totalTime,
                avg(score)      avgScore
         FROM tms_project_record pr
-                 LEFT JOIN hr_user_info u ON pr.userId = u.userId
+                 INNER JOIN hr_user_info u ON pr.userId = u.userId
         WHERE pr.userId = #{userid}
     </select>
     <!--    个人实验预览-->