Merge remote-tracking branch 'origin/master'

bc26c0a6 · jiaorz · 9a8bbc34 · 2815fe82 · bc26c0a6
Commit bc26c0a6 authored Sep 05, 2019 by jiaorz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

BackStageOrderController.java ...om/xxfc/platform/order/rest/BackStageOrderController.java +2 -0

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
@@ -106,6 +106,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
            AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
            if (appUserLogin != null) {
                dto.setUserId(appUserLogin.getId());
+            }else {
+                return ObjectRestResponse.succ(new PageDataVO<>());
            }
        }
        UserDTO userDTO = getAdminUserInfo();