From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 4f7ca0a..212a3a1 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -172,7 +172,7 @@
if (null != examScore.getLearnGrade() && null != examScore.getTheoryGrade()) {
ExamScore examScore1 = examScoreService.getById(examScore.getId());
//查询当前保安信息
- UserVO user = userService.getUserAgeById(Long.parseLong(examScore1.getUserId()));
+ UserVO user = userService.getUserAgeById(examScore1.getUserId());
//再根据身份证号查询用户,方式用户考了试，被删除，又新建的情况,修改最新用户的状态信息
User user1 = userService.getUserInfoByIdCardNo(user.getCardid());
//考试合格
@@ -429,7 +429,7 @@
*/
@PostMapping("/refreshTrainExamInfo")
public R refreshTrainExamInfo(@RequestBody UpdateParamVo updateParamVo) {
- return R.status(examScoreService.refreshTrainExamInfo(updateParamVo));
+ return R.data(examScoreService.refreshTrainExamInfo(updateParamVo));
}
/**
--
Gitblit v1.9.3