Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -227,7 +227,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         MPJLambdaWrapper<MaterialTask> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .orderByDesc(MaterialTask::getId)
-                .eq(MaterialTask::getCreateUserId, StpUtil.getLoginIdAsLong())
+                .eq(MaterialTask::getId, id)
                 .select(MaterialTask::getId)
                 .selectAs(MaterialType::getName, MaterialTaskVo::getMaterialTypeIdCn)
                 .selectAs(MaterialType::getCreateDate, MaterialTaskVo::getCreateDate)
@@ -304,10 +304,11 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
         }
 
         CompletableFuture.runAsync(() -> {
-            this.SendMessage(materialTask);
+            this.sendMessageUtil(materialTask);
         });
     }
-    public boolean SendMessage(MaterialTask materialTask ) {
+
+    private boolean sendMessageUtil(MaterialTask materialTask ) {
         IUserService userService = SpringUtil.getBean(IUserService.class);
         RedisUtil redisUtil = SpringUtil.getBean(RedisUtil.class);
         List<User> userList = redisUtil.get(GlobalConstant.USER_CACHE_KEY, new TypeReference<List<User>>() {