diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java index 591ee2f48..cf7685db7 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java @@ -191,7 +191,7 @@ public class VisitorsController { @Operation(summary = "app新增邀约" , description = "app新增拜访" ) @SysLog("新增邀约" ) @PostMapping("/app/saveYY") - @Idempotent(expireTime = 10, info = "请勿重复提交") + @Idempotent(expireTime = 5, info = "请勿重复提交") public R saveYY(@RequestBody VisitorsYYAppDTO visitors) { return R.ok(visitorsService.vistorsYYSave(visitors)); diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index 4f475df56..42077f5b0 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -272,9 +272,13 @@ public class VisitorsServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(VisitorsEntity::getUserId, userId); + if (StringUtils.isNotBlank(visitors.getType())&&VisitorTypeEnum.ZDYQ.getType().equals(visitors.getType())){ + wrapper.eq(VisitorsEntity::getUserId, userId); + wrapper.eq(VisitorsEntity::getType, visitors.getType()); + }else { + wrapper.eq(VisitorsEntity::getReceiveId, userId); + } wrapper.eq(StringUtils.isNotBlank(visitors.getCheckStatus()),VisitorsEntity::getCheckStatus, visitors.getCheckStatus()); - wrapper.eq(StringUtils.isNotBlank(visitors.getType()),VisitorsEntity::getType, visitors.getType()); wrapper.orderByDesc(VisitorsEntity::getCreateTime); Page pageData = baseMapper.selectPage(page, wrapper); List records = pageData.getRecords();