瀏覽代碼

修复Publisher为空时,包装结果错误问题

zhou-hao 5 年之前
父節點
當前提交
aff5692955

+ 5 - 4
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/web/ResponseMessageWrapper.java

@@ -78,14 +78,15 @@ public class ResponseMessageWrapper extends ResponseBodyResultHandler {
 
         if (body instanceof Mono) {
             body = ((Mono) body)
-                    .switchIfEmpty(Mono.just(ResponseMessage.ok()))
-                    .map(ResponseMessage::ok);
+                    .map(ResponseMessage::ok)
+                    .switchIfEmpty(Mono.just(ResponseMessage.ok()));
         }
         if (body instanceof Flux) {
             body = ((Flux) body)
                     .collectList()
-                    .switchIfEmpty(Mono.just(ResponseMessage.ok()))
-                    .map(ResponseMessage::ok);
+                    .map(ResponseMessage::ok)
+                    .switchIfEmpty(Mono.just(ResponseMessage.ok()));
+
         }
         if (body == null) {
             body = Mono.just(ResponseMessage.ok());