Merge branch 'master' into dev

zjk

2026-07-31 8665daa7aa863f96d0d8f27c167edae1efc38022

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiVisitorRecordController.java

@@ -129,8 +129,8 @@
        List<AreasList> areasList = null;

        //查询地区
        if (StringUtils.isNotEmpty(record.getVisitAreaIds())) {
            String[] visitAreaIds = record.getVisitAreaIds().split(",");
        if (StringUtils.isNotEmpty(request.getVisitAreaIds())) {
            String[] visitAreaIds = request.getVisitAreaIds().split(",");
            String visitArea = Arrays.stream(visitAreaIds)
                    .map(id -> {
                        SysVisitArea area = sysVisitAreaMapper.selectById(Long.parseLong(id.trim()));
@@ -149,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());
@@ -169,9 +169,10 @@
                record.setRemark("来访中，允许访问区域：" + visitArea);
            }
        }
// 如果 visitAreaIds 为空，但 visitAreaNames 不为空，根据名称查询填充 visitAreaIds
        else if (StringUtils.isNotEmpty(record.getVisitAreaNames())) {
            String[] visitAreaNames = record.getVisitAreaNames().split(",");

        // 如果 visitAreaIds 为空，但 visitAreaNames 不为空，根据名称查询填充 visitAreaIds
        else if (StringUtils.isNotEmpty(request.getVisitAreaNames())) {
            String[] visitAreaNames = request.getVisitAreaNames().split(",");

            // 根据区域名称查询对应的ID，构建ID字符串
            String visitAreaIdsStr = Arrays.stream(visitAreaNames)
@@ -272,7 +273,6 @@
        return AjaxResult.error("登记失败");
    }


    @PostMapping("/idCardSingOut")
    @ApiOperation(value = "访客身份证签离", notes = "访客身份证签离")
    @Transactional(rollbackFor = Exception.class)
@@ -312,11 +312,10 @@
        } else {
            record.setStatus("SIGNED_OUT");
        }
        record.setSignVerifyMethod("MANUAL");

        SysVisitorRecord visitorRecord = new SysVisitorRecord();
        BeanUtils.copyBeanProp(visitorRecord, request);
        visitorRecord.setSignVerifyMethod(record.getSignVerifyMethod());
        visitorRecord.setSignVerifyMethod(request.getSignVerifyMethod());
        visitorRecord.setStatus(record.getStatus());
        visitorRecord.setRecordId(record.getRecordId());
        visitorRecord.setSignTime(new Date());