From 4e214289ec907ecb1d14de3e6fcd17b4582257f0 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 12 Jul 2021 19:17:02 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 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 f3166ca..9e607a8 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
@@ -1700,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