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/TYouTuiController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
index 98c1b9c..37d17bb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TYouTuiController.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.TAgent;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
@@ -81,6 +82,8 @@
Date endTime = DateUtil.getDate_str4(split[1]);
wrapper.between("createTime",startTime,endTime);
}
+ wrapper.ne("status", StatusEnum.DELETE.getCode());
+ wrapper.orderBy("createTime",false);
return tYouTuiService.selectList(wrapper);
}
@@ -114,8 +117,8 @@
if(1 == tYouTui.getStatus()){
return new SuccessTip(500,"启用下的优推不可删除!");
}
-
- tYouTuiService.deleteById(tYouTuiId);
+ tYouTui.setStatus(StatusEnum.DELETE.getCode());
+ tYouTuiService.updateById(tYouTui);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1