From cc3a57f2a466a76a808b8171fdcfa5d10263e4eb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 Jan 2022 14:42:50 +0800
Subject: [PATCH] 1.考试查询修改 2.新增登录情况导出 3.题库查询修改

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 2081aec..e602b44 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -185,11 +185,11 @@
 			List<UserVO> userVOS = baseMapper.selectUserPagesByAge(page, user);
 			//机构名称拼接
 			userVOS.forEach(userVO -> {
-				if (null != userVO.getCardid() && userVO.getCardid() != "") {
-					userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
-				} else {
-					userVO.setAge(null);
-				}
+//				if (null != userVO.getCardid() && userVO.getCardid() != "") {
+//					userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+//				} else {
+//					userVO.setAge(null);
+//				}
 				if (null!=userVO.getDeptId()) {
 					List<String> list = baseMapper.getDeptName(userVO.getDeptId());
 					if (list.size() > 1) {
@@ -215,11 +215,11 @@
 			List<UserVO> userVOS = baseMapper.selectUserPages(page, user);
 			//机构名称拼接
 			userVOS.forEach(userVO -> {
-				if (null != userVO.getCardid() && userVO.getCardid() != "") {
-					userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
-				} else {
-					userVO.setAge(null);
-				}
+//				if (null != userVO.getCardid() && userVO.getCardid() != "") {
+//					userVO.setAge(AgeUtil.idCardToAge(userVO.getCardid()));
+//				} else {
+//					userVO.setAge(null);
+//				}
 				if (null!=userVO.getDeptId()) {
 					List<String> list = baseMapper.getDeptName(userVO.getDeptId());
 					if (list.size() > 1) {

--
Gitblit v1.9.3