From ebcc7c72663ae90d8960a6b027e26425e0a869e1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 20 九月 2023 18:00:58 +0800
Subject: [PATCH] #批量上传
---
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 454a509..ab87999 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -399,7 +399,7 @@
.eq(pageWrap.getModel().getCategoryId()!=null,BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId())
.eq(pageWrap.getModel().getBrandId()!=null,BaseGoods::getBrandId, pageWrap.getModel().getBrandId())
.eq(pageWrap.getModel().getStatus()!=null,BaseGoods::getStatus, pageWrap.getModel().getStatus())
- .notExists(user.getType().equals(Constants.UserType.COMPANY.getKey())," select 1 from goods g where g.GOODS_ID = t.id and g.TYPE = 1 and g.company_id = "+user.getCompanyId()+" ");
+ .notExists(user.getType().equals(Constants.UserType.COMPANY.getKey())," select 1 from goods g where g.GOODS_ID = t.id and g.TYPE = 1 and g.ISDELETED = 0 and g.company_id = "+user.getCompanyId()+" ");
queryWrapper.orderByDesc(Goods::getId);
PageData<BaseGoods> pageData =PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
@@ -516,6 +516,8 @@
// baseGoods.setImgurl();
baseGoods.setCategoryId(baseCategory.getId());
baseGoods.setBrandId(brand.getId());
+ baseGoods.setPinyin(PinYinUtil.getFullSpell(s.getName()));
+ baseGoods.setShortPinyin(PinYinUtil.getFirstSpell(s.getName()));
baseGoodsMapper.insert(baseGoods);
if(mulFiles !=null && mulFiles.size()>0){
--
Gitblit v1.9.3