From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
index afdea00..e14e2ac 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TEditionController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.modular.system.enums.StatusEnum;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -75,6 +76,8 @@
if(StringUtils.hasLength(editionNo)){
wrapper.like("editionNo",editionNo);
}
+ wrapper.ne("status", StatusEnum.DELETE.getCode());
+ wrapper.orderBy("createTime",false);
return tEditionService.selectList(wrapper);
}
@@ -103,7 +106,9 @@
@RequestMapping(value = "/delete")
@ResponseBody
public Object delete(@RequestParam Integer tEditionId) {
- tEditionService.deleteById(tEditionId);
+ TEdition tEdition = tEditionService.selectById(tEditionId);
+ tEdition.setStatus(StatusEnum.DELETE.getCode());
+ tEditionService.updateById(tEdition);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1