From e1c2b533d242571e7d321b05b3a9da3803004399 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 09:26:30 +0800
Subject: [PATCH] 保安员证电子信息查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 ++++++++-
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 4 ++--
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 2 +-
src/main/java/org/springblade/modules/system/service/IUserService.java | 2 +-
src/main/resources/application.yml | 1 +
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index 6cd8734..8c10da2 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -123,9 +123,9 @@
* @return
*/
@GetMapping("/getUserInfo")
- public UserVO getUserInfo(String securityNumber){
+ public UserVO getUserInfo(String securityNumber,String cardid){
//根据保安员编码查询保安员信息
- return userService.getUserInfoBySecurityNumber(securityNumber);
+ return userService.getUserInfoBySecurityNumber(securityNumber,cardid);
}
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index dcdd9f4..37f21f2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -187,7 +187,7 @@
* @param securityNumber 保安证编码
* @return
*/
- UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber);
+ UserVO getUserInfoBySecurityNumber(@Param("securityNumber") String securityNumber,@Param("cardid") String cardid);
/**
* 保安员信息
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 930341e..85a849c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -656,7 +656,14 @@
blade_dept bd
on
bu.dept_id = bd.id
- where securitynumber = #{securityNumber}
+ where
+ 1=1
+ <if test="securityNumber!=null and securityNumber!=''">
+ and securitynumber = #{securityNumber}
+ </if>
+ <if test="cardid!=null and cardid!=''">
+ and cardid = #{cardid}
+ </if>
and bu.status = 1
and bu.is_deleted = 0
</select>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index dd66bee..128f206 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -307,7 +307,7 @@
* @param securityNumber 保安证编码
* @return
*/
- UserVO getUserInfoBySecurityNumber(String securityNumber);
+ UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid);
/**
* 保安员信息
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 f647ebd..cba4196 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
@@ -1475,8 +1475,8 @@
* @return
*/
@Override
- public UserVO getUserInfoBySecurityNumber(String securityNumber) {
- UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ public UserVO getUserInfoBySecurityNumber(String securityNumber,String cardid) {
+ UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber,cardid);
//查询派遣信息
if (null!=userVO) {
DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1153eda..aa113ab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -214,6 +214,7 @@
- /record/details
- /recordk/save
- /recordk/details
+ - /blade-user/detail
#授权认证配置
auth:
--
Gitblit v1.9.3