From 989dcc6e5a2db194954d48ef411dab60b1fd35ea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 24 十二月 2025 15:53:21 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
index 8e5332b..1e88b59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmSalespersonController.java
@@ -21,6 +21,7 @@
import com.ruoyi.system.service.TCrmBranchService;
import com.ruoyi.system.service.TCrmChangePointsService;
import com.ruoyi.system.service.TCrmSalespersonService;
+import com.ruoyi.system.vo.TCrmSalespersonAndBranchVO;
import com.ruoyi.system.vo.TCrmSalespersonVO;
import com.ruoyi.system.vo.TErpGoodsVO;
import io.swagger.annotations.Api;
@@ -152,6 +153,52 @@
}
/**
+ * 获取crm业务员信息和分公司信息
+ */
+ @ApiOperation(value = "获取crm业务员信息和分公司信息")
+ @GetMapping(value = "/getSalespersonAndBranch")
+ public R<List<TCrmSalespersonAndBranchVO>> getSalespersonAndBranch() {
+
+ Long userId = tokenService.getLoginUser().getUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+
+ if(roleType != 3){
+ return R.fail("当前用户非业务员角色!");
+ }
+
+ LambdaQueryWrapper<TCrmSalesperson> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TCrmSalesperson::getUserId,userId);
+ wrapper.eq(TCrmSalesperson::getStatus,1)
+ .orderByDesc(TCrmSalesperson::getCreateTime)
+ .last("LIMIT 1");
+ TCrmSalesperson crmSalesperson = crmSalespersonService.getOne(wrapper);
+
+ if(Objects.isNull(crmSalesperson)){
+ return R.fail("当前用户未绑定业务员信息!");
+ }
+
+ List<TCrmSalespersonAndBranchVO> result = new ArrayList<>();
+
+ TCrmSalespersonAndBranchVO vo = new TCrmSalespersonAndBranchVO();
+ vo.setId(crmSalesperson.getId());
+ vo.setName(crmSalesperson.getSalespersonName());
+ vo.setType(2);
+ result.add(vo);
+ // 查询分公司
+ TCrmBranch crmBranch = crmBranchService.getById(crmSalesperson.getBranchId());
+ if(Objects.isNull(crmBranch)){
+ return R.fail("当前业务员未绑定分公司信息!");
+ }
+ vo = new TCrmSalespersonAndBranchVO();
+ vo.setId(crmBranch.getId());
+ vo.setName(crmBranch.getBranchName());
+ vo.setType(1);
+ result.add(vo);
+
+ return R.ok(result);
+ }
+
+ /**
* 添加crm业务员管理管理
*/
@Log(title = "crm业务员管理信息-新增crm业务员管理", businessType = BusinessType.INSERT)
--
Gitblit v1.7.1