From 05fa6d3f87c8048dd074cc4108abdb47304100c4 Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Wed, 13 Aug 2025 09:26:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B4=E5=AE=89=E4=BC=98=E5=8C=96=E8=AE=BF?=
 =?UTF-8?q?=E5=AE=A2=E7=94=B3=E8=AF=B7=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visitor/controller/VisitorController.java | 22 +++++++++----------
 .../mapper/system/visitor/VisitorMapper.xml   |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
index e3abcc4..e4df848 100644
--- a/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
+++ b/dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
@@ -350,20 +350,20 @@ public class VisitorController extends BaseController {
 
         //审核链接进来
         if (StringUtils.isNotBlank(telephone)) {
-            if (StringUtils.equals(visitor.getExamineState(), ExamineEnum.IN_REVIEW.getCode())) {
-                //查询当前点击审核链接的人员信息
-                SysPeople sysPeople = sysPeopleService.queryPeopleName(telephone, null);
+            //查询当前点击审核链接的人员信息
+            SysPeople sysPeople = sysPeopleService.queryPeopleName(telephone, null);
 
-                //根据手机号查询peopleId
-                Visitor visitor2 = new Visitor();
-                visitor2.setId(visitor.getId());
-                visitor2.setReviewer(String.valueOf(sysPeople.getId()));
-                visitor2.setPosition(null);
-                Visitor visitor1 = visitorService.queryReviewProcess(visitor2);
-                if (ObjectUtil.isNotNull(visitor1) && StrUtil.isNotBlank(visitor1.getState())) {
+            //根据手机号查询peopleId
+            Visitor visitor2 = new Visitor();
+            visitor2.setId(visitor.getId());
+            visitor2.setReviewer(String.valueOf(sysPeople.getId()));
+            visitor2.setPosition(null);
+            Visitor visitor1 = visitorService.queryReviewProcess(visitor2);
+            if (ObjectUtil.isNotNull(visitor1) && StrUtil.isNotBlank(visitor1.getState())) {
+                if (StringUtils.equals(visitor.getExamineState(), ExamineEnum.IN_REVIEW.getCode())) {
                     visitor.setExamineState(visitor1.getState());
-                    visitor.setRejectReason(visitor1.getRejectReason());
                 }
+                visitor.setRejectReason(visitor1.getRejectReason());
             }
         }
 
diff --git a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml
index 2decafa..4707536 100644
--- a/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml
+++ b/dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml
@@ -389,15 +389,15 @@
 
     <select id="addVisitorCheck" resultType="java.lang.String">
         select
-            phone
+        phone
         from vis_visitor
         where
-            end_time <![CDATA[ >= ]]> #{startTime}
+        end_time <![CDATA[ >= ]]> #{startTime}
         and phone in
         <foreach item="phone" collection="phones" open="(" separator="," close=")">
             #{phone}
         </foreach>
-        and examine_state != '2'
+        and examine_state in ('2','0')
     </select>
 
     <update id="updateVisitor" parameterType="Visitor">