From 0f195bd352212037e8e9fe866502a124d0d3e9ec Mon Sep 17 00:00:00 2001 From: hanxueda Date: Tue, 23 Apr 2019 20:51:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCreditHistoryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 4b6737a3f..051df941e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -100,7 +100,7 @@ public class WxCreditHistoryController extends BaseController { if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); WxMerchantBUser bUser = getUser(); WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); - if (merchant != null && merchant.getIsAdmin() == 1) { + if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { wxCreditHistory.setOperatorId(bUser.getId()); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); wxCreditHistory.setMerchantId(null);