From 3157990ecae78b357d26019aff2de2a572f0ddd3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Jul 2021 11:35:25 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..dd85f30 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
@@ -1441,7 +1441,7 @@
serviceItem.setServicesId(newId);
Long beautyOldId = serviceItem.getId();
serviceItem.setId(null);
- serviceItem.setExtract("数据迁移");
+// serviceItem.setExtract("数据迁移");
sysBeauticianStateDao.insert(serviceItem);
beautyMaps.put(beautyOldId, serviceItem.getId());
}
@@ -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) {
--
Gitblit v1.9.1