From 215f7ea77c797e0339eea9004e7261fc39486553 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 12 Jul 2021 19:16:59 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
index 3de7c6c..c1ce860 100644
--- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
@@ -1536,7 +1536,8 @@
moneyCardUse.setIsVipCar("N");
ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
- moneyCardUse.setCardName(shoppingGoods.getName());
+ if (shoppingGoods != null)
+ { moneyCardUse.setCardName(shoppingGoods.getName());}
Integer vipId = null;
if (moneyCardUse.getVipId() != null) {
@@ -1699,6 +1700,9 @@
for (SysBeauticianState state : sysBeauticianStates) {
Long staffId = state.getStaffId();
+ if (staffId == null) {
+ continue;
+ }
Integer integer = shopStaff.get(staffId.toString());
if (integer == null) {
--
Gitblit v1.9.1