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/TErpClinicWarehousingController.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
index d967333..c6cf934 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
@@ -25,6 +25,7 @@
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -47,12 +48,13 @@
private final TCrmSupplierService crmSupplierService;
private final TErpClinicWarehousingBatchService erpClinicWarehousingBatchService;
private final TErpGoodsUnitService erpGoodsUnitService;
+ private final ISysUserService sysUserService;
@Autowired
public TErpClinicWarehousingController(TErpClinicWarehousingService erpClinicWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService,
- TCrmClinicService crmClinicService,TCrmSupplierService crmSupplierService,TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
- TErpGoodsUnitService erpGoodsUnitService) {
+ TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
+ TErpGoodsUnitService erpGoodsUnitService, ISysUserService sysUserService) {
this.erpClinicWarehousingService = erpClinicWarehousingService;
this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
@@ -61,6 +63,7 @@
this.erpClinicWarehousingBatchService = erpClinicWarehousingBatchService;
this.erpGoodsUnitService = erpGoodsUnitService;
+ this.sysUserService = sysUserService;
}
@@ -80,6 +83,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){
@@ -87,6 +95,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());
}
@@ -107,6 +120,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){
@@ -114,6 +132,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());
}
@@ -204,6 +227,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());
+ }
supplierClinicId = crmClinic.getId();
}
@@ -223,6 +251,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());
+ }
supplierClinicId = crmClinic.getId();
}
@@ -242,6 +275,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());
+ }
supplierClinicId = crmClinic.getId();
}
@@ -260,6 +298,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());
+ }
supplierClinicId = crmClinic.getId();
}
@@ -277,6 +320,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());
+ }
supplierClinicId = crmClinic.getId();
}
erpClinicWarehousingService.warehouseGoods(dto,user,supplierClinicId);
@@ -294,6 +342,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());
+ }
supplierClinicId = crmClinic.getId();
List<TErpClinicWarehousing> list = erpClinicWarehousingService.list(new LambdaQueryWrapper<TErpClinicWarehousing>().eq(TErpClinicWarehousing::getClinicId, supplierClinicId).eq(TErpClinicWarehousing::getStatus, 1).orderByDesc(BaseModel::getCreateTime));
if(list.isEmpty()){
@@ -329,6 +382,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());
+ }
supplierClinicId = crmClinic.getId();
}
@@ -347,6 +405,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());
+ }
supplierClinicId = crmClinic.getId();
}
erpClinicWarehousingService.outboundGoods(dto,user,supplierClinicId);
--
Gitblit v1.7.1