bug

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -81,6 +81,9 @@ public class TaDrainageController extends BaseController {
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
+            if (null == status){
+                queryWrapper.gt("status",-1);
+            }
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
@@ -176,12 +179,13 @@ public class TaDrainageController extends BaseController {
             queryWrapper.eq("content_type",CommConstant.EVENT_H5);
             queryWrapper.eq("target_id",drainage.getDrainageId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
+            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
                 responseBean.addError("删除项目会删除全部数据，不建议删除数据。可以点击下架按钮终止活动。");
                 return responseBean;
             }
 
-            if(iTaDrainageService.removeById(id)){
+            drainage.setStatus(-1);
+            if(iTaDrainageService.updateById(drainage)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");