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/TErpSupplierWarehousingController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
index 3b3a210..7322161 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -13,10 +13,7 @@
import com.ruoyi.system.model.TCrmClinic;
import com.ruoyi.system.model.TCrmSupplier;
import com.ruoyi.system.query.*;
-import com.ruoyi.system.service.TCrmClinicService;
-import com.ruoyi.system.service.TCrmSupplierService;
-import com.ruoyi.system.service.TErpGoodsService;
-import com.ruoyi.system.service.TErpSupplierWarehousingService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import com.ruoyi.web.core.config.LakalaConfig;
import io.swagger.annotations.Api;
@@ -26,6 +23,7 @@
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -46,15 +44,17 @@
private final TokenService tokenService;
private final TCrmClinicService crmClinicService;
private final TCrmSupplierService crmSupplierService;
+ private final ISysUserService sysUserService;
@Autowired
public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService,
- TCrmClinicService crmClinicService,TCrmSupplierService crmSupplierService) {
+ TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
this.erpSupplierWarehousingService = erpSupplierWarehousingService;
this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
this.crmClinicService = crmClinicService;
this.crmSupplierService = crmSupplierService;
+ this.sysUserService = sysUserService;
}
@@ -73,6 +73,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ***
+ if(Objects.isNull(crmSupplier)){
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
query.setSupplierClinicId(crmSupplier.getId());
}
if(roleType == 5){
@@ -80,6 +85,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());
+ }
query.setSupplierClinicId(crmClinic.getId());
}
--
Gitblit v1.7.1