From 4cb4eba2d43f732907e4ccd73c43fca919bb5d6d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 09 十二月 2025 11:35:10 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
index 1266469..48bb8df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
@@ -81,6 +81,22 @@
List<String> branchIds = crmBranchAreas.stream().map(TCrmBranchArea::getBranchId).collect(Collectors.toList());
query.setBranchIds(branchIds);
}
+
+ if(query.getRoleType() == 2){
+ // 查询分公司账号
+ TCrmBranch crmBranch = this.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getUserId, query.getUserId())
+ .eq(TCrmBranch::getStatus, 1)
+ .last("LIMIT 1"));
+ List<TCrmBranch> crmBranches = this.list(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getProvinceBranchId, crmBranch.getId()));
+ if(CollectionUtils.isEmpty(crmBranches)){
+ return pageInfo;
+ }
+ List<String> branchIds = crmBranches.stream().map(TCrmBranch::getId).collect(Collectors.toList());
+ query.setBranchIdList(branchIds);
+ }
+
List<TCrmBranchVO> list = this.baseMapper.pageList(query,pageInfo);
if(CollectionUtils.isEmpty(list)){
return pageInfo;
--
Gitblit v1.7.1