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 basicInstrumentMaintainRelevanceResponses = null; +// companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + ""); + companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getUnitFk() + ""); +// List basicInstrumentMaintainRelevanceResponses = null; + List 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, "该企业已选择该产品,请勿重复选择!");