From d99a7a5fff2641459f8746138a678de043ff2c3e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 05 Jan 2022 09:34:34 +0800
Subject: [PATCH] 培训报名年龄计算修改

---
 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 6780ebc..06618f4 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -25,6 +25,7 @@
 import org.springblade.modules.exam.service.ExamPaperService;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserVO;
 import org.springblade.modules.training.entity.TrainingRegistration;
 import org.springblade.modules.training.excel.TrainingRegistrationExcel;
 import org.springblade.modules.training.excel.TrainingRegistrationImporter;
@@ -302,9 +303,9 @@
 		//遍历
 		list.forEach(userId ->{
 			User user = userService.getById(userId);
+			UserVO userVO = userService.getUserAgeById(Long.parseLong(userId));
 			//判断年龄
-			Integer age = AgeUtil.idCardToAge(user.getCardid());
-			if (age>=18 && age<=60) {
+			if (userVO.getAge()>=18 && userVO.getAge()<=60) {
 				//未报名的新增,已报名的不做处理
 				if (null == user.getIsTrain()) {
 					TrainingRegistration trainingRegistration1 = new TrainingRegistration();

--
Gitblit v1.9.3