From c02602d0949b688421edc6d6f29e108cc7233873 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Tue, 16 Mar 2021 16:39:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?id=E4=B8=BA=E7=A9=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/msdw/tms/controller/UserInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/msdw/tms/controller/UserInfoController.java b/src/main/java/com/msdw/tms/controller/UserInfoController.java index f5bac50..b859d1a 100644 --- a/src/main/java/com/msdw/tms/controller/UserInfoController.java +++ b/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); } From afb32a45159dfd87f21c7683169f300a90c76acf Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Wed, 17 Mar 2021 10:40:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E8=AE=B0=E5=BD=95-?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/ProjectRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 8495e51..fd6d0cd 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/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}