From 682a6e95720bc41cbd42480c2352301496091d89 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 19:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 7dff32c..1385e9e 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
@@ -150,7 +150,12 @@
 
     @Override
     public void deleteById(Integer id) {
-        baseGoodsMapper.deleteById(id);
+        BaseGoods model = new BaseGoods();
+        model.setId(id);
+        model.setEditDate(new Date());
+        model.setIsdeleted(Constants.ZERO);
+        updateById(model);
+//        baseGoodsMapper.deleteById(id);
     }
 
     @Override
@@ -164,7 +169,10 @@
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        baseGoodsMapper.deleteBatchIds(ids);
+        for(Integer id : ids){
+            deleteById(id);
+        }
+//        baseGoodsMapper.deleteBatchIds(ids);
     }
 
 

--
Gitblit v1.9.3