|
@@ -239,7 +239,7 @@ public class PickingInfo {
|
|
|
for (Project project:listProjectPicking){
|
|
|
for (Acquisition acquisition:findListDate){
|
|
|
if (project.getId().equals(acquisition.getProjectId())){
|
|
|
- if (null!=acquisition.getManagerTime()){
|
|
|
+ if (null!=acquisition.getManagerTime()&&!"".equals(acquisition.getManagerTime())){
|
|
|
projectAcquisition = new ProjectAcquisition();
|
|
|
projectAcquisition.setId(acquisition.getId());
|
|
|
projectAcquisition.setProjectNumber(project.getProjectNumber());
|