瀏覽代碼

Merge remote-tracking branch 'origin/master'

hurx 1 周之前
父節點
當前提交
b29c058d20

+ 12 - 0
ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductPoolAuditServiceImpl.java

@@ -113,6 +113,18 @@ public class ProductPoolAuditServiceImpl  extends ServiceImpl<ProductPoolAuditMa
                     productPoolAuditVo.setAuditByName(AuditByName);
                 }
             }
+            if(ObjectUtil.isNotEmpty(productPoolAuditVo.getItemId())) {
+                ExternalItemDto externalItemDto = remoteExternalItemService.getItemInfo(productPoolAuditVo.getItemId());
+                if(externalItemDto != null) {
+                    productPoolAuditVo.setPoolName(externalItemDto.getItemName());
+                }
+            }
+            if(ObjectUtil.isNotEmpty(productPoolAuditVo.getProtocolId())) {
+                ProtocolInfo protocolInfo = protocolInfoMapper.selectById(productPoolAuditVo.getProtocolId());
+                if(protocolInfo != null) {
+                    productPoolAuditVo.setPoolName(protocolInfo.getCustomerName());
+                }
+            }
         }
         List<ProductPoolLinkAudit> productPoolLinkAudits = productPoolLinkAuditMapper.selectList(Wrappers.lambdaQuery(ProductPoolLinkAudit.class).eq(ProductPoolLinkAudit::getPoolAuditId, id));
         if (ObjectUtil.isNotEmpty(productPoolLinkAudits)){