From e542a78c3be53518204dff0649bee46b7bb966af Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 17:59:52 +0800
Subject: [PATCH] 从业记录查询修改，导入接口修改，年龄查询按身份证查
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 8657224..2ee9d82 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
@@ -26,6 +26,7 @@
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.cache.UserCache;
+import org.springblade.common.constant.AgeUtil;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
@@ -139,7 +140,15 @@
@Override
public IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user) {
- return page.setRecords(baseMapper.selectUserPages(page, user));
+ 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);
+ }
+ });
+ return page.setRecords(userVOS);
}
@Override
@@ -335,6 +344,8 @@
}
//设置部门id
user.setDeptId(userDeptService.selectIn(user.getDeptId()));
+ //设置账号
+ user.setAccount(user.getCardid());
//获取默认密码配置
user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
@@ -577,6 +588,8 @@
}
//设置部门id
user.setDeptId(userDeptService.selectIn(user.getDeptId()));
+ //设置账号
+ user.setAccount(user.getCardid());
//获取默认密码配置
user.setPassword(ParamCache.getValue(DEFAULT_PARAM_PASSWORD));
//新增
--
Gitblit v1.9.3