From 4068eb1f7c50b37d816934b822116f45af182b0e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 11 九月 2025 09:02:41 +0800
Subject: [PATCH] 供应商erp
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 575b4f4..6938000 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
@@ -41,13 +41,15 @@
private final TCrmBranchSalaryService crmBranchSalaryService;
private final ISysUserService sysUserService;
private final TCrmChangePointsService crmChangePointsService;
+ private final TCrmPositionService crmPositionService;
@Autowired
- public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService) {
+ public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService, TCrmPositionService crmPositionService) {
this.crmBranchService = crmBranchService;
this.crmBranchAreaService = crmBranchAreaService;
this.crmBranchSalaryService = crmBranchSalaryService;
this.sysUserService = sysUserService;
this.crmChangePointsService = crmChangePointsService;
+ this.crmPositionService = crmPositionService;
}
/**
@@ -103,7 +105,11 @@
List<TCrmBranchArea> crmBranchAreas = crmBranchAreaService.list(Wrappers.lambdaQuery(TCrmBranchArea.class).eq(TCrmBranchArea::getBranchId, id));
crmBranchVO.setCrmBranchAreas(crmBranchAreas);
// 职位薪资
+ List<TCrmPosition> crmPositions = crmPositionService.list();
List<TCrmBranchSalary> crmBranchSalaries = crmBranchSalaryService.list(Wrappers.lambdaQuery(TCrmBranchSalary.class).eq(TCrmBranchSalary::getBranchId, id));
+ for (TCrmBranchSalary crmBranchSalary : crmBranchSalaries) {
+ crmPositions.stream().filter(crmPosition -> Objects.equals(crmPosition.getId(), crmBranchSalary.getPositionId())).findFirst().ifPresent(crmPosition -> crmBranchSalary.setPositionName(crmPosition.getPositionName()));
+ }
crmBranchVO.setCrmBranchSalaries(crmBranchSalaries);
return R.ok(crmBranchVO);
}
--
Gitblit v1.7.1