Merge branch 'release-mg-v2.9.0' into test

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -555,7 +555,8 @@ public class CommonServiceImpl implements ICommonService {
         MqSendLog mqSendLog = null;
         if(status != null || status != -1){//-1代表未进入到计算前置处理器，计算调度器不能进行调度
             mqSendLog = mqSendLogService.getOne(new LambdaQueryWrapper<MqSendLog>().eq(MqSendLog::getNum, num).eq(MqSendLog::getStatus, -1));
-        }else{
+        }
+        if(mqSendLog == null){
             mqSendLog = new MqSendLog();
         }