[积分][修改]:积分列表增加判断

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