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/test/java/com/matrix/DataMoveTest.java | 1 +
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 3 +++
2 files changed, 4 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 d58e1b3..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
@@ -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) {
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index ff133c1..1192415 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -161,6 +161,7 @@
dataMove.roleNew2(dataMove.roleOld2());
}
+ @Test
public void updateServiceOrderStaff() {
dataMove.updateServiceOrderStaff();
}
--
Gitblit v1.9.1