兴安优化访客申请限制

dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java

@@ -350,7 +350,6 @@ public class VisitorController extends BaseController {
 
         //审核链接进来
         if (StringUtils.isNotBlank(telephone)) {
-            if (StringUtils.equals(visitor.getExamineState(), ExamineEnum.IN_REVIEW.getCode())) {
             //查询当前点击审核链接的人员信息
             SysPeople sysPeople = sysPeopleService.queryPeopleName(telephone, null);
 
@@ -361,9 +360,10 @@ public class VisitorController extends BaseController {
             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());
             }
         }
 

dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml

@@ -397,7 +397,7 @@
         <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">