suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #39 into master from cc_20251208_visit

Browse Source 
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/39
This commit is contained in:
王非凡
2026-02-03 09:53:24 +00:00
committed by 正新
parent 83fcb84f9d
commit d3a331798c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/request/visit/VisitPartnerQueryRequest.java
View File

@@ -19,4 +19,7 @@ public class VisitPartnerQueryRequest extends PageBasicInfo {
@ApiModelProperty(value = "拜访用户id,查询我的拜访时传当前用户", hidden = true) @ApiModelProperty(value = "拜访用户id,查询我的拜访时传当前用户", hidden = true)
private String userId; private String userId;
@ApiModelProperty(value = "是否无视管辖权限", hidden = true)
private Boolean filterAuth;
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/visit/impl/VisitRecordServiceImpl.java
View File

@@ -107,7 +107,7 @@ public class VisitRecordServiceImpl implements VisitRecordService {
public PageInfo<VisitPartnerListVO> visitPartnerList(VisitPartnerQueryRequest request) { public PageInfo<VisitPartnerListVO> visitPartnerList(VisitPartnerQueryRequest request) {
List<Long> authRegionIds = null; List<Long> authRegionIds = null;
String currentUserId = CurrentUserHolder.getUserId(); String currentUserId = CurrentUserHolder.getUserId();
if (!sysRoleService.checkIsAdmin(currentUserId)) { if (!sysRoleService.checkIsAdmin(currentUserId) && !Boolean.TRUE.equals(request.getFilterAuth())) {
authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdExcludeStoreByUserId(currentUserId) authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdExcludeStoreByUserId(currentUserId)
.stream() .stream()
.map(Long::valueOf) .map(Long::valueOf)

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/VisitRecordController.java
View File

@@ -59,13 +59,13 @@ public class VisitRecordController {
@PostMapping("/personPartnerList") @PostMapping("/personPartnerList")
public ResponseResult<PageInfo<VisitPartnerListVO>> personVisitPartnerList(@RequestBody VisitPartnerQueryRequest request) { public ResponseResult<PageInfo<VisitPartnerListVO>> personVisitPartnerList(@RequestBody VisitPartnerQueryRequest request) {
request.setUserId(CurrentUserHolder.getUserId()); request.setUserId(CurrentUserHolder.getUserId());
request.setFilterAuth(true);
return ResponseResult.success(visitRecordService.visitPartnerList(request)); return ResponseResult.success(visitRecordService.visitPartnerList(request));
} }
@ApiOperation("查询拜访记录简单信息（h5使用）") @ApiOperation("查询拜访记录简单信息（h5使用）")
@PostMapping("/simpleList") @PostMapping("/simpleList")
public ResponseResult<PageInfo<VisitRecordSimpleListVO>> recordSimpleList(@RequestBody VisitRecordSimpleQueryRequest request) { public ResponseResult<PageInfo<VisitRecordSimpleListVO>> recordSimpleList(@RequestBody VisitRecordSimpleQueryRequest request) {
request.setUserId(CurrentUserHolder.getUserId());
return ResponseResult.success(visitRecordService.recordSimpleList(request)); return ResponseResult.success(visitRecordService.recordSimpleList(request));
} }