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/TErpIssueReportingController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java
index 66c5c56..b827536 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java
@@ -14,6 +14,7 @@
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.model.TErpIssueReporting;
import com.ruoyi.system.query.TErpIssueReportingQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpIssueReportingService;
@@ -45,12 +46,14 @@
private final TCrmClinicService crmClinicService;
private final TCrmSupplierService crmSupplierService;
private final TokenService tokenService;
+ private final ISysUserService sysUserService;
@Autowired
- public TErpIssueReportingController(TErpIssueReportingService erpIssueReportingService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TokenService tokenService) {
+ public TErpIssueReportingController(TErpIssueReportingService erpIssueReportingService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TokenService tokenService, ISysUserService sysUserService) {
this.erpIssueReportingService = erpIssueReportingService;
this.crmClinicService = crmClinicService;
this.crmSupplierService = crmSupplierService;
this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
}
/**
@@ -66,6 +69,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId)
.last("LIMIT 1"));
+ // ***
+ if(Objects.isNull(crmSupplier)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
query.setReportUserId(crmSupplier.getId());
}
if(roleType == 5){
@@ -73,6 +81,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId)
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
query.setReportUserId(crmClinic.getId());
}
return R.ok(erpIssueReportingService.pageList(query));
@@ -92,6 +105,11 @@
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, userId)
.last("LIMIT 1"));
+ // ***
+ if(Objects.isNull(crmSupplier)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
dto.setReportUserId(crmSupplier.getId());
}
if(roleType == 5){
@@ -99,6 +117,11 @@
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, userId)
.last("LIMIT 1"));
+ // ---
+ if(Objects.isNull(crmClinic)){
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
dto.setReportUserId(crmClinic.getId());
}
return R.ok(erpIssueReportingService.save(dto));
--
Gitblit v1.7.1