From 59220a96b90a813b8865f5e23002a866b567ceee Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 21 Apr 2023 14:22:21 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9Amdm=E5=90=8C=E6=AD=A5=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=81=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0=E5=9C=B0=E5=9D=80=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BASQL=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/commodity/service/impl/CommodityServiceImpl.java | 3 ++- .../consumer/openapi/service/impl/SDEnregyServiceImpl.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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 86587925..90d1561a 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 @@ -241,9 +241,10 @@ public class CommodityServiceImpl implements CommodityService { } map1.put("productName", xmmc); map1.put("zxbm", zxbm); + map1.put("entId",commodityCodeCheckQuery.getDeptId()); log.debug("{}校验名称是否存在 参数:{}", LOGGER_MSG, map1); - List commodityCodeEntityList = commodityMapper.queryProductList(map1, shList); + List commodityCodeEntityList = commodityMapper.queryProductList(map1, null); /* 如果返回数组中没有数据,直接返回校验通过 如果返回数组中数据大于0,需要判断传递的id和查询结果的id是否一致 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index adf87000..43737924 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -140,7 +140,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { buyerManageIds.add(buyerEntity.getId()); } buyerMapper.batchDeleteBuyerDetail(buyerManageIds); - buyerMapper.batchInsertBuyerDetail(buyerEntityDetail); + if(buyerEntityDetail.size()>0){ + buyerMapper.batchInsertBuyerDetail(buyerEntityDetail); + } if (buyerMapper.batchUpdateBuyer(entity, null,buyerManageIds) > 0) { entity.setSuccess(true); @@ -172,8 +174,8 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { // entity.setMdmMulticodeJson(JsonUtils.getInstance().toJsonStringNullToEmpty()); entity.setUUID(tempMdmGmfxxtbReqBO.getUUID()); entity.setStatus("1"); + buyerMapper.deleteBuyerDetail(entity.getId()); if(entity.getBuyerEntityDetail() != null && entity.getBuyerEntityDetail().size()>0){ - buyerMapper.deleteBuyerDetail(entity.getId()); buyerMapper.batchInsertBuyerDetail(entity.getBuyerEntityDetail()); } if (buyerMapper.insertBuyerOnDuplicateKey(entity) > 0) {