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 @@