From 694030733daa2e8b2f90f526b4ecb1a230a89136 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 十月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
index 9819c50..710465c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -72,13 +73,18 @@
@Override
public void deleteById(String id) {
- baseParamMapper.deleteById(id);
+ BaseParam baseParam = new BaseParam();
+ baseParam.setId(id);
+ baseParam.setEditDate(new Date());
+ baseParam.setIsdeleted(Constants.ONE);
+ baseParamMapper.updateById(baseParam);
}
@Override
public void delete(BaseParam baseParam) {
- UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
- baseParamMapper.delete(deleteWrapper);
+// UpdateWrapper<BaseParam> deleteWrapper = new UpdateWrapper<>(baseParam);
+ baseParam.setIsdeleted(Constants.ONE);
+ baseParamMapper.updateById(baseParam);
}
@Override
@@ -87,7 +93,9 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- baseParamMapper.deleteBatchIds(ids);
+ for(String id :ids){
+ deleteById(id);
+ }
}
@Override
@@ -138,6 +146,7 @@
@Override
public List<BaseParam> findList(BaseParam baseParam) {
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
+ baseParam.setIsdeleted(Constants.ZERO);
wrapper.orderByAsc("sortnum");
return baseParamMapper.selectList(wrapper);
}
@@ -193,6 +202,7 @@
@Override
public long count(BaseParam baseParam) {
QueryWrapper<BaseParam> wrapper = new QueryWrapper<>(baseParam);
+ baseParam.setIsdeleted(Constants.ZERO);
return baseParamMapper.selectCount(wrapper);
}
}
--
Gitblit v1.9.3