From 782ef4493c10caa79bf2cfe401f84c93b4aa1ec8 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 七月 2026 16:35:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/fangkeji
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java
index d8b3afc..88e5222 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java
@@ -23,6 +23,7 @@
import com.ruoyi.system.mapper.SysVisitAreaMapper;
import com.ruoyi.system.mapper.SysVisitorRecordMapper;
import com.ruoyi.system.service.ISysVisitAreaService;
+import com.ruoyi.system.utils.EmployeePhoneCrypto;
import com.ruoyi.system.vo.SysVisitAreaVO;
import com.ruoyi.web.controller.service.SysVisitorRecordService;
import com.ruoyi.web.controller.service.VisitorRegisterSyncService;
@@ -73,6 +74,21 @@
return AjaxResult.error("被访人不能为空");
}
+ List<Employee> employeeISList = employeeMapper.selectEnabledByEmployeeName(request.getIntervieweeName());
+ if (employeeISList.isEmpty()) {
+ throw new ServiceException("被访人不存在，请联系工作人员");
+ }else {
+ //重名
+ if (StringUtils.isNotEmpty(request.getBeVisitorPhone())) {
+ String phoneHash = StringUtils.isEmpty(request.getBeVisitorPhone()) ? null : EmployeePhoneCrypto.hash(request.getBeVisitorPhone());
+
+ Employee employee = employeeMapper.selectOne(new LambdaQueryWrapper<Employee>().eq(Employee::getContactPhoneHash, phoneHash));
+ if (employee == null) {
+ throw new ServiceException("被访人不存在，请联系工作人员");
+ }
+ }
+ }
+
// 签离的当天不能再次进入 签到
LambdaQueryWrapper<SysVisitorRecord> yqwrapper = new LambdaQueryWrapper<>();
Date todayStart = DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH); // 当天 00:00:00
@@ -118,6 +134,9 @@
String visitArea = Arrays.stream(visitAreaIds)
.map(id -> {
SysVisitArea area = sysVisitAreaMapper.selectById(Long.parseLong(id.trim()));
+ if (area == null || "1".equals(area.getDelFlag())) {
+ throw new ServiceException("访问区域不存在，请联系工作人员");
+ }
return area != null ? area.getAreaName() : null;
})
.filter(Objects::nonNull)
@@ -130,7 +149,7 @@
.map(id -> {
SysVisitArea area = sysVisitAreaMapper.selectById(Long.parseLong(id));
if (area == null) {
- return null;
+ throw new ServiceException("访问区域不存在，请联系工作人员");
}
AreasList areas = new AreasList();
areas.setAreaCode(area.getAreaCode());
@@ -199,11 +218,14 @@
//查询接待人的部门
if (StringUtils.isNotEmpty(record.getIntervieweeName())) {
- Employee employee = employeeMapper.selectEnabledByEmployeeName(record.getIntervieweeName());
- if (employee != null && employee.getDeptId() != null) {
- SysDept sysDept = sysDeptMapper.selectDeptById(employee.getDeptId());
- if (sysDept != null) {
- record.setIntervieweeDept(sysDept.getDeptName());
+ List<Employee> employee = employeeMapper.selectEnabledByEmployeeName(record.getIntervieweeName());
+ if (!employee.isEmpty()) {
+ Employee employeeNo1 = employee.get(0);
+ if (employeeNo1.getDeptId() != null) {
+ SysDept sysDept = sysDeptMapper.selectDeptById(employeeNo1.getDeptId());
+ if (sysDept != null) {
+ record.setIntervieweeDept(sysDept.getDeptName());
+ }
}
}
}
--
Gitblit v1.7.1