111

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java

@@ -18,6 +18,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -126,6 +127,9 @@ public class PreDealServiceImpl implements PreDealService {
     @Override
     public List<String> listDataIdByTaskIdAndDataType(String taskId, Integer dateType) {
         List<String> list = preDealLogMapper.listDataIdByTaskIdAndDataType(taskId,dateType);
+        if(list == null){
+        	list = new ArrayList<String>();
+        }
         return list;
     }