diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index 0aa3686b..fa24b1e0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -22,6 +22,7 @@ import com.dxhy.core.service.singletable.IExcelExportlogService; import com.dxhy.core.util.JsonResponseUtils; import com.dxhy.oss.service.FileService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import java.io.File; import java.io.FileOutputStream; @@ -228,14 +229,20 @@ public class ManualAthensThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0))); + } + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(rzFpxxService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(rzFpxxService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } }