From af17b0f5142f5b4a5c1c40cd0db814cacca6ceaf Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 十二月 2025 18:52:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 2e1f149..a679d71 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
@@ -137,17 +137,28 @@
Long userId = tokenService.getLoginUser().getUserId();
TCrmBranch crmBranch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
.eq(TCrmBranch::getUserId, userId)
- .eq(TCrmBranch::getPersonType, 1)
.eq(TCrmBranch::getStatus, 1)
.last("LIMIT 1"));
if(Objects.isNull(crmBranch)){
return R.ok(new ArrayList<>());
}
- List<TCrmBranch> crmBranches = crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
- .eq(TCrmBranch::getProvinceBranchId, crmBranch.getId())
- .eq(TCrmBranch::getStatus, 1)
- .orderByDesc(TCrmBranch::getCreateTime));
- return R.ok(crmBranches);
+ if(crmBranch.getPersonType() == 1){
+ List<TCrmBranch> crmBranches = crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getProvinceBranchId, crmBranch.getId())
+ .eq(TCrmBranch::getStatus, 1)
+ .orderByDesc(TCrmBranch::getCreateTime));
+ crmBranches.add(crmBranch);
+ return R.ok(crmBranches);
+ }
+ if(crmBranch.getPersonType() == 2){
+ List<TCrmBranch> crmBranches = crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
+ .eq(TCrmBranch::getCorrelationPersonId, userId)
+ .eq(TCrmBranch::getStatus, 1)
+ .orderByDesc(TCrmBranch::getCreateTime));
+ crmBranches.add(crmBranch);
+ return R.ok(crmBranches);
+ }
+ return R.ok();
}
/**
--
Gitblit v1.7.1