修复消息撤回失败的问题

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);
     }

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("撤回失败，请刷新重试");
     }

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);
     }

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("撤回失败，请刷新重试");
     }