访客线上登记 扫二维码后,如果检查到被访人、访问区域和管理后台的不一致不要给出对应提示。如“被访人不存在,请联系工作人员”,“访问区域不存在,请联系工作人员”
3个文件已修改
40 ■■■■■ 已修改文件
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/dto/SysVisitorRecordAddRequest.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/EmployeeMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
@@ -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());
                    }
                }
            }
        }
ruoyi-system/src/main/java/com/ruoyi/system/dto/SysVisitorRecordAddRequest.java
@@ -50,6 +50,9 @@
    @ApiModelProperty(value = "被访人")
    private String intervieweeName;
    @ApiModelProperty(value = "被访人电话")
    private String beVisitorPhone;
    /**
     * 接待人验证方式
     */
ruoyi-system/src/main/java/com/ruoyi/system/mapper/EmployeeMapper.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.Employee;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -8,7 +9,7 @@
import java.util.List;
@Mapper
public interface EmployeeMapper {
public interface EmployeeMapper extends BaseMapper<Employee> {
    /**
     * 按主键查询启用且未删除的接待人。
@@ -19,7 +20,7 @@
    /**
     * 根据员工姓名精准查询启用的员工
     */
    Employee selectEnabledByEmployeeName(@Param("employeeName") String employeeName);
    List<Employee> selectEnabledByEmployeeName(@Param("employeeName") String employeeName);
    List<Employee> selectAllEnabled();
}