Merge branch 'master' into dev

zjk

2026-07-31 8665daa7aa863f96d0d8f27c167edae1efc38022

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorConfigServiceImpl.java

@@ -93,6 +93,16 @@
        {
            config.setAppointmentRegistrationEnabled(request.getAppointmentRegistrationEnabled());
        }
        if (request.getAppointmentDefaultVisitTime() != null)
        {
            String appointmentDefaultVisitTime = StringUtils.trim(request.getAppointmentDefaultVisitTime());
            if (StringUtils.isNotEmpty(appointmentDefaultVisitTime)
                    && !appointmentDefaultVisitTime.matches("([01]\\d|2[0-3]):[0-5]\\d"))
            {
                throw new ServiceException("预约登记默认访问时间格式不正确");
            }
            config.setAppointmentDefaultVisitTime(appointmentDefaultVisitTime);
        }
        if (request.getRegisterReceiverConfirmEnabled() != null)
        {
            config.setRegisterReceiverConfirmEnabled(request.getRegisterReceiverConfirmEnabled());
@@ -181,6 +191,7 @@
        SysVisitorConfig config = new SysVisitorConfig();
        config.setOnsiteRegistrationEnabled(true);
        config.setAppointmentRegistrationEnabled(true);
        config.setAppointmentDefaultVisitTime("");
        config.setRegisterReceiverConfirmEnabled(true);
        config.setSignReceiverConfirmEnabled(true);
        config.setFaceCompareEnabled(true);
@@ -200,6 +211,7 @@
        vo.setConfigId(config.getConfigId());
        vo.setOnsiteRegistrationEnabled(config.getOnsiteRegistrationEnabled());
        vo.setAppointmentRegistrationEnabled(config.getAppointmentRegistrationEnabled());
        vo.setAppointmentDefaultVisitTime(config.getAppointmentDefaultVisitTime());
        vo.setRegisterReceiverConfirmEnabled(config.getRegisterReceiverConfirmEnabled());
        vo.setSignReceiverConfirmEnabled(config.getSignReceiverConfirmEnabled());
        vo.setFaceCompareEnabled(config.getFaceCompareEnabled());