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/TErpGoodsController.java | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
index 2a21975..f76ec87 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -45,10 +45,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -75,11 +72,12 @@
private final TErpMaintenanceReminderService erpMaintenanceReminderService;
private final TCrmClinicService crmClinicService;
private final TCrmSupplierService crmSupplierService;
+ private final ISysUserService sysUserService;
@Autowired
public TErpGoodsController(TErpGoodsService erpGoodsService, TokenService tokenService, TErpGoodsTypeService erpGoodsTypeService, TErpGoodsUnitService erpGoodsUnitService,
TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService, TErpSupplierWarehousingService erpSupplierWarehousingService,
- TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService) {
+ TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
this.erpGoodsTypeService = erpGoodsTypeService;
@@ -90,6 +88,7 @@
this.erpMaintenanceReminderService = erpMaintenanceReminderService;
this.crmClinicService = crmClinicService;
this.crmSupplierService = crmSupplierService;
+ this.sysUserService = sysUserService;
}
@@ -107,6 +106,12 @@
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 +119,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());
}
return R.ok(erpGoodsService.pageList(query,user));
@@ -150,6 +160,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();
}
Page<TErpGoods> tErpGoodsPage = new Page<>(query.getPageNum(), query.getPageSize());
@@ -173,6 +188,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();
}
@@ -214,6 +234,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());
+ }
goods.setSupplierClinicId(crmSupplier.getId());
goods.setGoodsSource(1);
}
@@ -222,6 +247,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());
+ }
goods.setSupplierClinicId(crmClinic.getId());
goods.setGoodsSource(2);
}
@@ -255,6 +285,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());
+ }
goods.setSupplierClinicId(crmClinic.getId());
goods.setGoodsSource(2);
}
@@ -283,6 +318,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());
+ }
goods.setSupplierClinicId(crmClinic.getId());
goods.setGoodsSource(2);
}
@@ -308,6 +348,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());
+ }
cid = crmClinic.getId();
if(goods.getGoodsSource()==1){
String clinicIds = goods.getClinicIds();
@@ -342,6 +387,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());
+ }
cid = crmClinic.getId();
for (TErpGoods goods : list) {
String clinicIds = goods.getClinicIds();
@@ -395,6 +445,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());
+ }
clinicSupplierId = crmSupplier.getId();
}
if(roleType == 5){
@@ -402,6 +457,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();
}
@@ -461,6 +521,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){
@@ -468,6 +533,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());
}
@@ -526,6 +596,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());
+ }
goods.setSupplierClinicId(crmSupplier.getId());
goods.setGoodsSource(1);
}
@@ -534,6 +609,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());
+ }
goods.setSupplierClinicId(crmClinic.getId());
goods.setGoodsSource(2);
}
--
Gitblit v1.7.1