From d3a331798cd9e3b7d66a76be786d3eb0aa420a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Tue, 3 Feb 2026 09:53:24 +0000 Subject: [PATCH] Merge #39 into master from cc_20251208_visit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:拜访我的加盟商取消管辖权限过滤 * cc_20251208_visit: (21 commits squashed) - feat:拜访记录 - fix:拜访详情接口新增字段 - fix:新增状态转义字段 - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选 - fix - fix:管理员能查看所有加盟商 - fix:去掉部分字段非空校验 - fix:空校验 - Merge branch 'master' into cc_20251208_visit # Conflicts: # coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java # coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java # coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java - fix - fix:拜访记录失效延时消息 - fix:拜访记录统计 - fix:拜访记录统计新增筛选条件 - fix:字段转义 - feat:拜访调整 - feat:拜访调整_过滤我的 - feat:拜访调整_过滤我的 - feat:拜访字段调整 - feat:拜访字段调整 - Merge branch 'master' into cc_20251208_visit - fix:拜访我的加盟商取消管辖权限过滤 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/39 --- .../com/cool/store/request/visit/VisitPartnerQueryRequest.java | 3 +++ .../cool/store/service/visit/impl/VisitRecordServiceImpl.java | 2 +- .../com/cool/store/controller/webb/VisitRecordController.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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)); }