From c1ec9cb262c5598e04e0ef8ba6ff3fba7005045c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Mon, 17 Jul 2023 15:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=99=A8=E6=A2=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=E5=8F=AF=E4=BB=A5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=80=89=E5=85=A5=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiRlSupController.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
index 377ebc9b6..4202dbbb1 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java
@@ -277,12 +277,15 @@ public class UdiRlSupController extends BaseController {
         }
         //查询本企业有没有选择该产品有选择不能选择
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
-        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
-        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+//        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
+        companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getUnitFk() + "");
+//        List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+        List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
         companyProductRelevanceRequest.setDiType(1);
-        basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
+//        basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
+        basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
         String rlidStr = udiInfoExportRequest.getRlIds().get(0);
-        for (CompanyProductRelevanceResponse obj : basicInstrumentMaintainRelevanceResponses) {
+        for (UdiRlSupResponse obj : basicInstrumentMaintainRelevanceResponses) {
             String rlid = String.valueOf(obj.getRlId());
             if (rlid.equals(rlidStr)) {
                 return ResultVOUtils.error(999, "该企业已选择该产品，请勿重复选择！");