From a1ea9d50c54a918591cdb1ecb39a03ff90db9564 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 03 十二月 2025 18:01:02 +0800
Subject: [PATCH] 文档新增
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index af47b76..023c7f2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -608,7 +608,7 @@
@ApiOperation(value = "分公司管理员-首页统计(获取所有分公司信息)")
- @PostMapping(value = "/branchAdminList")
+ @GetMapping(value = "/branchAdminList")
public R<List<BranchAdminListVO>> branchAdminList() {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
@@ -668,15 +668,21 @@
return R.ok(branchAdminListVOs);
}
@ApiOperation(value = "分公司管理员-首页统计(获取所有业务员信息)")
- @PostMapping(value = "/branchAdminSaleList")
- public R<List<BranchAdminListVO>> branchAdminSaleList() {
+ @GetMapping(value = "/branchAdminSaleList")
+ public R<List<BranchAdminListVO>> branchAdminSaleList(String branchId) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
ArrayList<BranchAdminListVO> branchAdminListVOs = new ArrayList<>();
if (roleType == 2) {
- TCrmBranch branch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
- .eq(TCrmBranch::getUserId, user.getUserId())
- .last("LIMIT 1"));
+ TCrmBranch branch =null;
+ if(branchId==null || branchId.isEmpty()){
+ branch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ }else {
+ branch = crmBranchService.getById(branchId);
+ }
+
if (branch != null) {
// 如果是区
if (branch.getPersonType() != null && branch.getPersonType() == 2) {
--
Gitblit v1.7.1