From e2e2c1d21cd3cf197816990a7faf275e02fed7f8 Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Thu, 6 Aug 2020 20:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toesbieya/jxc/message/controller/ManageController.java | 5 +++-- .../java/cn/toesbieya/jxc/message/service/ManageService.java | 4 ++-- .../cn/toesbieya/jxc/controller/msg/ManageController.java | 1 - .../main/java/cn/toesbieya/jxc/service/msg/MsgService.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java index 0ddd795..5734e2b 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java @@ -3,6 +3,7 @@ package cn.toesbieya.jxc.message.controller; import cn.toesbieya.jxc.common.model.entity.Msg; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.Result; +import cn.toesbieya.jxc.common.model.vo.UserVo; import cn.toesbieya.jxc.message.constant.MsgConstant; import cn.toesbieya.jxc.message.model.vo.MsgSearch; import cn.toesbieya.jxc.message.service.ManageService; @@ -69,11 +70,11 @@ public class ManageController { public Result withdraw(@RequestBody Msg msg) { if (msg.getId() == null) return Result.fail("参数错误"); - SysUser user = SessionUtil.get(); + UserVo user = SessionUtil.get(); + msg.setWid(user.getId()); msg.setWname(user.getName()); msg.setWtime(System.currentTimeMillis()); - msg.setStatus(MsgConstant.STATUS_WITHDREW); return service.withdraw(msg); } diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java index 575586c..7dd2365 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java @@ -111,12 +111,12 @@ public class ManageService { int rows = mapper.update( null, Wrappers.lambdaUpdate(Msg.class) - .set(Msg::getStatus, msg.getStatus()) + .set(Msg::getStatus, MsgConstant.STATUS_WITHDREW) .set(Msg::getWid, msg.getWid()) .set(Msg::getWname, msg.getWname()) .set(Msg::getWtime, msg.getWtime()) .eq(Msg::getId, msg.getId()) - .eq(Msg::getStatus, msg.getStatus()) + .eq(Msg::getStatus, MsgConstant.STATUS_PUBLISHED) ); return rows > 0 ? Result.success("撤回成功", msg) : Result.fail("撤回失败，请刷新重试"); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java index 369ef8c..93c9f39 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java @@ -73,7 +73,6 @@ public class ManageController { msg.setWid(user.getId()); msg.setWname(user.getName()); msg.setWtime(System.currentTimeMillis()); - msg.setStatus(MsgConstant.STATUS_WITHDREW); return service.withdraw(msg); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java index 9d971ce..92075e5 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java @@ -113,12 +113,12 @@ public class MsgService { int rows = mapper.update( null, Wrappers.lambdaUpdate(Msg.class) - .set(Msg::getStatus, msg.getStatus()) + .set(Msg::getStatus, MsgConstant.STATUS_WITHDREW) .set(Msg::getWid, msg.getWid()) .set(Msg::getWname, msg.getWname()) .set(Msg::getWtime, msg.getWtime()) .eq(Msg::getId, msg.getId()) - .eq(Msg::getStatus, msg.getStatus()) + .eq(Msg::getStatus, MsgConstant.STATUS_PUBLISHED) ); return rows > 0 ? Result.success("撤回成功", msg) : Result.fail("撤回失败，请刷新重试"); }