From d47e5818d63bef779ff8c4cef79382ae63e99fb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 16:30:28 +0800
Subject: [PATCH] 二维码生成修改，保安员证信息查询修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 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 9c66160..0d22d61 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
@@ -42,6 +42,7 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
@@ -1390,7 +1391,17 @@
*/
@Override
public UserVO getUserInfoBySecurityNumber(String securityNumber) {
- return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ //查询派遣信息
+ if (null!=userVO) {
+ DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
+ if (null != dispatcherVO) {
+ userVO.setDispatchUnitName(dispatcherVO.getDispatcherCompany());
+ userVO.setDispatchStartTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getDispatchertime()));
+ userVO.setDispatchEndTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getEndTime()));
+ }
+ }
+ return userVO;
}
--
Gitblit v1.9.3