From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
index 36d9f54..7d5f0c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
@@ -44,15 +44,17 @@
private final ISysUserService sysUserService;
private final TCrmChangePointsService crmChangePointsService;
private final TCrmPositionService crmPositionService;
+ private final TCrmSalespersonService crmSalespersonService;
private final TokenService tokenService;
@Autowired
- public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService, TCrmPositionService crmPositionService, TokenService tokenService) {
+ public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService, TCrmPositionService crmPositionService, TCrmSalespersonService crmSalespersonService, TokenService tokenService) {
this.crmBranchService = crmBranchService;
this.crmBranchAreaService = crmBranchAreaService;
this.crmBranchSalaryService = crmBranchSalaryService;
this.sysUserService = sysUserService;
this.crmChangePointsService = crmChangePointsService;
this.crmPositionService = crmPositionService;
+ this.crmSalespersonService = crmSalespersonService;
this.tokenService = tokenService;
}
@@ -74,9 +76,18 @@
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
Long userId = tokenService.getLoginUser().getUserId();
LambdaQueryWrapper<TCrmBranch> wrapper = new LambdaQueryWrapper<>();
- if (roleType == 1) {
+ if (roleType == 2) {
wrapper.eq(TCrmBranch::getUserId, userId);
}
+ if(roleType == 3){
+ // 查询业务员信息
+ TCrmSalesperson crmSalesperson = crmSalespersonService.getOne(Wrappers.lambdaQuery(TCrmSalesperson.class)
+ .eq(TCrmSalesperson::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(crmSalesperson)){
+ wrapper.eq(TCrmBranch::getId, crmSalesperson.getBranchId());
+ }
+ }
wrapper.eq(TCrmBranch::getStatus,1).orderByDesc(TCrmBranch::getCreateTime);
return R.ok(crmBranchService.list(wrapper));
}
--
Gitblit v1.7.1