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);