Merge branch 'feature-zjw' into dev

9570fe6b · 周健威 · f50f8f90 · e4b87ede · 9570fe6b
Commit 9570fe6b authored Sep 29, 2019 by 周健威
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BaseOrderController.java ...ava/com/xxfc/platform/order/rest/BaseOrderController.java +1 -1

No files found.
--- a/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
+++ b/xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
@@ -270,7 +270,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
        BaseOrder dbBaseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
            setNo(no);
        }});
-        if (null == dbBaseOrder || !BaseContextHandler.getUserID().equals(dbBaseOrder.getUserId().toString())) {
+        if (null == dbBaseOrder || !userId.equals(dbBaseOrder.getUserId().toString())) {
            throw new BaseException(ResultCode.NOTEXIST_CODE);
        }