From 4296ec60e7bcdd232ee07aebd2c8466b32df7734 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 七月 2026 10:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/fangkeji
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/EmployeeDto.java | 6 ++++++
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmployeeVerifyController.java | 7 +++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmployeeVerifyController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmployeeVerifyController.java
index d08512d..447ee8d 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmployeeVerifyController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/EmployeeVerifyController.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.mapper.SysVisitorMachineMapper;
import com.ruoyi.system.service.EmployeeVerifyService;
import com.ruoyi.system.service.ISysVisitorMachineService;
+import com.ruoyi.system.utils.EmployeePhoneCrypto;
import com.ruoyi.system.vo.SysVisitorMachineVO;
import com.ruoyi.web.controller.tool.ImageUtil;
import io.swagger.annotations.Api;
@@ -85,6 +86,12 @@
dto.setFaceImage(base64);
}
+ if (StringUtils.isNotEmpty(employee.getContactPhoneCipher())) {
+ String phone = EmployeePhoneCrypto.decrypt(employee.getContactPhoneCipher());
+ dto.setPhone(phone);
+ }
+ dto.setContactPhoneCipher(null);
+
return dto;
})
.collect(Collectors.toList());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/EmployeeDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/EmployeeDto.java
index dcee6ea..219187c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/EmployeeDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/EmployeeDto.java
@@ -25,4 +25,10 @@
@ApiModelProperty("人像图片")
private String faceImage;
+
+ @ApiModelProperty("手机号")
+ private String phone;
+
+ // 手机号加密的
+ private String contactPhoneCipher;
}
--
Gitblit v1.7.1