From 4ed87ad0831059cb7cda83e9c8834286aa3fc0da Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 15 Jun 2023 14:33:28 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E7=89=A9=E6=96=99=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AD=98=E5=82=A8=E6=8A=A5=E9=94=99=E8=BF=94=E5=9B=9E?= =?UTF-8?q?9999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java index 3db0916f..e63c793e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java @@ -377,8 +377,12 @@ public class CommodityServiceImpl implements CommodityService { } num++; } + R ok = R.ok(); + if(resultMap.size() > 0){ + ok = R.error(); + } - return R.ok().put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) + return ok.put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) .put("fail", resultMap.size()); }