From e5d8b92923059affb23b2b40a5d96baa3a9e889d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 10 Jul 2021 14:25:51 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 2 +-
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 3 ++-
2 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 32ef850..cd588ef 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) {
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index 0c6cb3c..c315f93 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -855,7 +855,7 @@
<select id="selectById" resultMap="ShoppingGoodsMap">
select
*,
- (select TYPE_NAME from sys_goods_type b where b.id=goods_sort_id) goodsSortName,
+ -- (select TYPE_NAME from sys_goods_type b where b.id=a.goods_sort_id) goodsSortName,
(select NAME from shopping_goods_category t where
t.id=cate_id)
cate_name
--
Gitblit v1.9.1