From 8150429bb4292d9ec828b23a22ac5e855799b820 Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 26 Jan 2021 14:04:14 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=9C=A8=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E7=9A=84=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=EF=BC=8CUILockButton=E4=BC=9A=E8=B0=83=E7=94=A8isLock?= =?UTF-8?q?ed=E6=96=B9=E6=B3=95=EF=BC=8C=E6=AD=A4=E6=97=B6=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=A9=BA=E9=97=B4=E5=AF=B9=E8=B1=A1=E6=B1=A0=E4=B8=AD?= =?UTF-8?q?=E8=BF=98=E6=B2=A1=E6=9C=89=E5=AF=B9=E8=B1=A1=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E6=AD=A4=E8=8E=B7=E5=8F=96=E5=88=B0=E7=9A=84operator=E6=98=AFn?= =?UTF-8?q?ull=EF=BC=8C=E4=BC=9A=E6=8A=A5npe=20=E3=80=90=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E3=80=91=E5=81=9A=E4=B8=AA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/editlock/EditLockUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java index 2ab10fb922..4f332a1707 100644 --- a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java +++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java @@ -74,6 +74,8 @@ public class EditLockUtils { } public static boolean isLocked(LockItem lockItem) { - return WorkContext.getCurrent().get(EditLockOperator.class).isLocked(lockItem); + EditLockOperator operator = WorkContext.getCurrent().get(EditLockOperator.class); + // 启动过程中UILockButton初始化的时候会调用这个方法，但是此时workObjectPool中还没有对象，会报npe + return operator != null && operator.isLocked(lockItem); } }