Merge remote-tracking branch 'origin/master'

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -406,7 +406,6 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             String resourceType = sfcDispatchDto.getResourceType();
 
             String [] employeeArray = null;
-            Map<String, Object> disMap = new HashMap<>();
             //派工导入
             if (DispatchStatusEnum.IMPORT.getCode().equals(type)) {
                 String handle = HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo);
@@ -473,6 +472,16 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
 
                 list.add(sfcDispatch);
 
+
+                //记录派工人员
+                if (employeeArray != null && employeeArray.length > 0) {
+                    SfcDispatchEmployeeDto sfcDispatchEmployee = new SfcDispatchEmployeeDto();
+                    sfcDispatchEmployee.setSite(site);
+                    sfcDispatchEmployee.setSfcDispatchBo(handle);
+                    sfcDispatchEmployee.setDispatchEmployee(employeeArray);
+                    sfcDispatchEmployeeList.add(sfcDispatchEmployee);
+                }
+
                 continue;
             }