From 3eda5364adada942f76a9f8a5f57881406f44286 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 29 十月 2025 10:10:38 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 932b2b3..9cae021 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -66,13 +67,14 @@
private final TCrmSalespersonService crmSalespersonService;
private final TErpProcurementCommissionService erpProcurementCommissionService;
private final TCrmWarehouseService crmWarehouseService;
+ private final ISysUserService sysUserService;
@Autowired
public TErpProcurementController(TErpProcurementService erpProcurementService, TokenService tokenService, TCrmClinicService crmClinicService, TErpProcurementGoodsService erpProcurementGoodsService
, TErpGoodsService erpGoodsService, TErpClinicWarehousingService erpClinicWarehousingService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
- TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService) {
+ TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService) {
this.erpProcurementService = erpProcurementService;
this.tokenService = tokenService;
this.crmClinicService = crmClinicService;
@@ -91,6 +93,7 @@
this.crmWarehouseService = crmWarehouseService;
+ this.sysUserService = sysUserService;
}
@@ -161,6 +164,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
clinicSupplierId = crmClinic.getId();
}
erpProcurementService.addProcurement(clinicSupplierId, user, dtos);
@@ -178,6 +186,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
clinicSupplierId = crmClinic.getId();
}
TErpProcurement tErpProcurement = erpProcurementService.getById(id);
@@ -204,6 +217,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
clinicSupplierId = crmClinic.getId();
}
@@ -262,6 +280,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
clinicSupplierId = crmClinic.getId();
}
ArrayList<DetailProcurementNextVO> detailProcurementNextVOS = new ArrayList<>();
@@ -303,6 +326,11 @@
crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
clinicSupplierId = crmClinic.getId();
}
TErpProcurement erpProcurement = erpProcurementService.getById(dto.getId());
--
Gitblit v1.7.1