diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/visit/VisitPartnerQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/visit/VisitPartnerQueryRequest.java index a228070ba..90c6c0fa6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/visit/VisitPartnerQueryRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/visit/VisitPartnerQueryRequest.java @@ -19,4 +19,7 @@ public class VisitPartnerQueryRequest extends PageBasicInfo { @ApiModelProperty(value = "拜访用户id,查询我的拜访时传当前用户", hidden = true) private String userId; + + @ApiModelProperty(value = "是否无视管辖权限", hidden = true) + private Boolean filterAuth; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/visit/impl/VisitRecordServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/visit/impl/VisitRecordServiceImpl.java index 76db92a64..ea1cdfc19 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/visit/impl/VisitRecordServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/visit/impl/VisitRecordServiceImpl.java @@ -107,7 +107,7 @@ public class VisitRecordServiceImpl implements VisitRecordService { public PageInfo visitPartnerList(VisitPartnerQueryRequest request) { List authRegionIds = null; String currentUserId = CurrentUserHolder.getUserId(); - if (!sysRoleService.checkIsAdmin(currentUserId)) { + if (!sysRoleService.checkIsAdmin(currentUserId) && !Boolean.TRUE.equals(request.getFilterAuth())) { authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdExcludeStoreByUserId(currentUserId) .stream() .map(Long::valueOf) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java index 39606bd29..76f74b1dc 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java @@ -59,13 +59,13 @@ public class VisitRecordController { @PostMapping("/personPartnerList") public ResponseResult> personVisitPartnerList(@RequestBody VisitPartnerQueryRequest request) { request.setUserId(CurrentUserHolder.getUserId()); + request.setFilterAuth(true); return ResponseResult.success(visitRecordService.visitPartnerList(request)); } @ApiOperation("查询拜访记录简单信息(h5使用)") @PostMapping("/simpleList") public ResponseResult> recordSimpleList(@RequestBody VisitRecordSimpleQueryRequest request) { - request.setUserId(CurrentUserHolder.getUserId()); return ResponseResult.success(visitRecordService.recordSimpleList(request)); }