From b4946c9ecce3fbbc63e8a16cc47dd432ec421268 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 20 Mar 2023 16:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 422 ++++++++++--------
 1 file changed, 224 insertions(+), 198 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 2a199b25..304ad227 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2650,27 +2650,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                                 //循环调用每一个 文件 获取文件名称
                                                                 String id = fileId;
                                                                 AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                                String theSame = isTheSame(byId.getOldFileName(),bid);
-                                                                if (theSame.equals("1")) {
-                                                                    //证明找到文件名称一致的了
-                                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                                    //原文译文 进行判断
-                                                                    if(sortSign != null) {
-                                                                        if (sortSign.getSortSign().contains("译")) {
-                                                                            if (StringUtils.isNotBlank(yi)) {
-                                                                                yi = yi+"," + fileId;
+                                                                if(byId!=null) {
+                                                                    String theSame = isTheSame(byId.getOldFileName(), bid);
+                                                                    if (theSame.equals("1")) {
+                                                                        //证明找到文件名称一致的了
+                                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                                        //原文译文 进行判断
+                                                                        if(sortSign != null) {
+                                                                            if (sortSign.getSortSign().contains("译")) {
+                                                                                if (StringUtils.isNotBlank(yi)) {
+                                                                                    yi = yi+"," + fileId;
+                                                                                } else {
+                                                                                    yi = fileId;
+                                                                                }
                                                                             } else {
-                                                                                yi = fileId;
-                                                                            }
-                                                                        } else {
-                                                                            if (StringUtils.isNotBlank(yuan)) {
-                                                                                yuan = yuan+"," + fileId;
-                                                                            } else {
-                                                                                yuan = fileId;
+                                                                                if (StringUtils.isNotBlank(yuan)) {
+                                                                                    yuan = yuan+"," + fileId;
+                                                                                } else {
+                                                                                    yuan = fileId;
+                                                                                }
                                                                             }
                                                                         }
-                                                                    }
 
+                                                                    }
                                                                 }
                                                             }
                                                         } else {
@@ -2765,23 +2767,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                 }else {
                                                     String id = SarStandardsInfo.getFileId();
                                                     AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                    String theSame = isTheSame(byId.getOldFileName(), bid);
-                                                    if (theSame.equals("1")) {
-                                                        //证明找到文件名称一致的了
-                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                        //原文译文 进行判断
-                                                        if(sortSign != null) {
-                                                            if (sortSign.getSortSign().contains("译")) {
-                                                                if (StringUtils.isNotBlank(yi)) {
-                                                                    yi = yi+"," + SarStandardsInfo.getFileId();
+                                                    if(byId!=null){
+                                                        String theSame = isTheSame(byId.getOldFileName(), bid);
+                                                        if (theSame.equals("1")) {
+                                                            //证明找到文件名称一致的了
+                                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                            //原文译文 进行判断
+                                                            if(sortSign != null) {
+                                                                if (sortSign.getSortSign().contains("译")) {
+                                                                    if (StringUtils.isNotBlank(yi)) {
+                                                                        yi = yi+"," + SarStandardsInfo.getFileId();
+                                                                    } else {
+                                                                        yi = SarStandardsInfo.getFileId();
+                                                                    }
                                                                 } else {
-                                                                    yi = SarStandardsInfo.getFileId();
-                                                                }
-                                                            } else {
-                                                                if (StringUtils.isNotBlank(yuan)) {
-                                                                    yuan = yuan+"," + SarStandardsInfo.getFileId();
-                                                                } else {
-                                                                    yuan = SarStandardsInfo.getFileId();
+                                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                                        yuan = yuan+"," + SarStandardsInfo.getFileId();
+                                                                    } else {
+                                                                        yuan = SarStandardsInfo.getFileId();
+                                                                    }
                                                                 }
                                                             }
                                                         }
@@ -2810,25 +2814,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                         //循环调用每一个 文件 获取文件名称
                                                         String id = fileId;
                                                         AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                        String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
-                                                        if (theSame.equals("1")) {
-                                                            //证明找到文件名称一致的了
-                                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                            //原文译文 进行判断
-                                                            if(sortSign != null) {
-                                                                if (sortSign.getSortSign().contains("译")) {
-                                                                    if (StringUtils.isNotBlank(yi)) {
-                                                                        yi = yi+"," + fileId;
+                                                        if(byId!=null){
+                                                            String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
+                                                            if (theSame.equals("1")) {
+                                                                //证明找到文件名称一致的了
+                                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                                //原文译文 进行判断
+                                                                if(sortSign != null) {
+                                                                    if (sortSign.getSortSign().contains("译")) {
+                                                                        if (StringUtils.isNotBlank(yi)) {
+                                                                            yi = yi+"," + fileId;
+                                                                        } else {
+                                                                            yi = fileId;
+                                                                        }
                                                                     } else {
-                                                                        yi = fileId;
-                                                                    }
-                                                                } else {
-                                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                                        yuan = yuan+"," + fileId;
-                                                                    } else {
-                                                                        yuan = fileId;
-                                                                    }
+                                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                                            yuan = yuan+"," + fileId;
+                                                                        } else {
+                                                                            yuan = fileId;
+                                                                        }
 
+                                                                    }
                                                                 }
                                                             }
                                                         }
@@ -2926,23 +2932,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                             //循环调用每一个 文件 获取文件名称
                                             String id = SarStandardsInfo.getFileId();
                                             AttFileEO byId = attFileEOService.getFileInfo(id);
-                                            String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
-                                            if (theSame.equals("1")) {
-                                                //证明找到文件名称一致的了
-                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                //原文译文 进行判断
-                                                if(sortSign != null) {
-                                                    if (sortSign.getSortSign().contains("译")) {
-                                                        if (StringUtils.isNotBlank(yi)) {
-                                                            yi = yi+"," + SarStandardsInfo.getFileId();
+                                            if(byId!=null){
+                                                String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
+                                                if (theSame.equals("1")) {
+                                                    //证明找到文件名称一致的了
+                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                    //原文译文 进行判断
+                                                    if(sortSign != null) {
+                                                        if (sortSign.getSortSign().contains("译")) {
+                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                yi = yi+"," + SarStandardsInfo.getFileId();
+                                                            } else {
+                                                                yi = SarStandardsInfo.getFileId();
+                                                            }
                                                         } else {
-                                                            yi = SarStandardsInfo.getFileId();
-                                                        }
-                                                    } else {
-                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                            yuan = yuan+"," + SarStandardsInfo.getFileId();
-                                                        } else {
-                                                            yuan = SarStandardsInfo.getFileId();
+                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                yuan = yuan+"," + SarStandardsInfo.getFileId();
+                                                            } else {
+                                                                yuan = SarStandardsInfo.getFileId();
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -3009,27 +3017,29 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                             //循环调用每一个 文件 获取文件名称
                                                             String id = fileId;
                                                             AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                            String theSame = isTheSame(byId.getOldFileName(),bid);
-                                                            if (theSame.equals("1")) {
-                                                                //证明找到文件名称一致的了
-                                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                                //原文译文 进行判断
-                                                                if(sortSign != null) {
-                                                                    if (sortSign.getSortSign().contains("译")) {
-                                                                        if (StringUtils.isNotBlank(yi)) {
-                                                                            yi = yi+"," + fileId;
+                                                            if(byId!=null){
+                                                                String theSame = isTheSame(byId.getOldFileName(),bid);
+                                                                if (theSame.equals("1")) {
+                                                                    //证明找到文件名称一致的了
+                                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                                    //原文译文 进行判断
+                                                                    if(sortSign != null) {
+                                                                        if (sortSign.getSortSign().contains("译")) {
+                                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                                yi = yi+"," + fileId;
+                                                                            } else {
+                                                                                yi = fileId;
+                                                                            }
                                                                         } else {
-                                                                            yi = fileId;
-                                                                        }
-                                                                    } else {
-                                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                                            yuan = yuan+"," + fileId;
-                                                                        } else {
-                                                                            yuan = fileId;
+                                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                                yuan = yuan+"," + fileId;
+                                                                            } else {
+                                                                                yuan = fileId;
+                                                                            }
                                                                         }
                                                                     }
-                                                                }
 
+                                                                }
                                                             }
                                                         }
                                                     } else {
@@ -3124,23 +3134,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                             }else {
                                                 String id = SarStandardsInfo.getFileId();
                                                 AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                String theSame = isTheSame(byId.getOldFileName(), bid);
-                                                if (theSame.equals("1")) {
-                                                    //证明找到文件名称一致的了
-                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                    //原文译文 进行判断
-                                                    if(sortSign != null) {
-                                                        if (sortSign.getSortSign().contains("译")) {
-                                                            if (StringUtils.isNotBlank(yi)) {
-                                                                yi = yi+"," + SarStandardsInfo.getFileId();
+                                                if(byId!=null){
+                                                    String theSame = isTheSame(byId.getOldFileName(), bid);
+                                                    if (theSame.equals("1")) {
+                                                        //证明找到文件名称一致的了
+                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                        //原文译文 进行判断
+                                                        if(sortSign != null) {
+                                                            if (sortSign.getSortSign().contains("译")) {
+                                                                if (StringUtils.isNotBlank(yi)) {
+                                                                    yi = yi+"," + SarStandardsInfo.getFileId();
+                                                                } else {
+                                                                    yi = SarStandardsInfo.getFileId();
+                                                                }
                                                             } else {
-                                                                yi = SarStandardsInfo.getFileId();
-                                                            }
-                                                        } else {
-                                                            if (StringUtils.isNotBlank(yuan)) {
-                                                                yuan = yuan+"," + SarStandardsInfo.getFileId();
-                                                            } else {
-                                                                yuan = SarStandardsInfo.getFileId();
+                                                                if (StringUtils.isNotBlank(yuan)) {
+                                                                    yuan = yuan+"," + SarStandardsInfo.getFileId();
+                                                                } else {
+                                                                    yuan = SarStandardsInfo.getFileId();
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -3169,25 +3181,27 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                     //循环调用每一个 文件 获取文件名称
                                                     String id = fileId;
                                                     AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                    String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
-                                                    if (theSame.equals("1")) {
-                                                        //证明找到文件名称一致的了
-                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                        //原文译文 进行判断
-                                                        if(sortSign != null) {
-                                                            if (sortSign.getSortSign().contains("译")) {
-                                                                if (StringUtils.isNotBlank(yi)) {
-                                                                    yi = yi+"," + fileId;
+                                                    if(byId!=null){
+                                                        String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
+                                                        if (theSame.equals("1")) {
+                                                            //证明找到文件名称一致的了
+                                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                            //原文译文 进行判断
+                                                            if(sortSign != null) {
+                                                                if (sortSign.getSortSign().contains("译")) {
+                                                                    if (StringUtils.isNotBlank(yi)) {
+                                                                        yi = yi+"," + fileId;
+                                                                    } else {
+                                                                        yi = fileId;
+                                                                    }
                                                                 } else {
-                                                                    yi = fileId;
-                                                                }
-                                                            } else {
-                                                                if (StringUtils.isNotBlank(yuan)) {
-                                                                    yuan = yuan+"," + fileId;
-                                                                } else {
-                                                                    yuan = fileId;
-                                                                }
+                                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                                        yuan = yuan+"," + fileId;
+                                                                    } else {
+                                                                        yuan = fileId;
+                                                                    }
 
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -3285,23 +3299,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         //循环调用每一个 文件 获取文件名称
                                         String id = SarStandardsInfo.getFileId();
                                         AttFileEO byId = attFileEOService.getFileInfo(id);
-                                        String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
-                                        if (theSame.equals("1")) {
-                                            //证明找到文件名称一致的了
-                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                            //原文译文 进行判断
-                                            if(sortSign != null) {
-                                                if (sortSign.getSortSign().contains("译")) {
-                                                    if (StringUtils.isNotBlank(yi)) {
-                                                        yi = yi+"," + SarStandardsInfo.getFileId();
+                                        if(byId!=null){
+                                            String theSame = isTheSame(byId.getOldFileName(), SarStandardsInfo.getBuildId());
+                                            if (theSame.equals("1")) {
+                                                //证明找到文件名称一致的了
+                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                //原文译文 进行判断
+                                                if(sortSign != null) {
+                                                    if (sortSign.getSortSign().contains("译")) {
+                                                        if (StringUtils.isNotBlank(yi)) {
+                                                            yi = yi+"," + SarStandardsInfo.getFileId();
+                                                        } else {
+                                                            yi = SarStandardsInfo.getFileId();
+                                                        }
                                                     } else {
-                                                        yi = SarStandardsInfo.getFileId();
-                                                    }
-                                                } else {
-                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                        yuan = yuan+"," + SarStandardsInfo.getFileId();
-                                                    } else {
-                                                        yuan = SarStandardsInfo.getFileId();
+                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                            yuan = yuan+"," + SarStandardsInfo.getFileId();
+                                                        } else {
+                                                            yuan = SarStandardsInfo.getFileId();
+                                                        }
                                                     }
                                                 }
                                             }
@@ -3368,28 +3384,31 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                             //循环调用每一个 文件 获取文件名称
                                                             String id = fileId;
                                                             AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                            String theSame = isTheSame(byId.getOldFileName(),bid);
-                                                            if (theSame.equals("1")) {
-                                                                //证明找到文件名称一致的了
-                                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                                //原文译文 进行判断
-                                                                if(sortSign != null) {
-                                                                    if (sortSign.getSortSign().contains("译")) {
-                                                                        if (StringUtils.isNotBlank(yi)) {
-                                                                            yi = yi+"," + fileId;
+                                                            if(byId!=null){
+                                                                String theSame = isTheSame(byId.getOldFileName(),bid);
+                                                                if (theSame.equals("1")) {
+                                                                    //证明找到文件名称一致的了
+                                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                                    //原文译文 进行判断
+                                                                    if(sortSign != null) {
+                                                                        if (sortSign.getSortSign().contains("译")) {
+                                                                            if (StringUtils.isNotBlank(yi)) {
+                                                                                yi = yi+"," + fileId;
+                                                                            } else {
+                                                                                yi = fileId;
+                                                                            }
                                                                         } else {
-                                                                            yi = fileId;
-                                                                        }
-                                                                    } else {
-                                                                        if (StringUtils.isNotBlank(yuan)) {
-                                                                            yuan = yuan+"," + fileId;
-                                                                        } else {
-                                                                            yuan = fileId;
+                                                                            if (StringUtils.isNotBlank(yuan)) {
+                                                                                yuan = yuan+"," + fileId;
+                                                                            } else {
+                                                                                yuan = fileId;
+                                                                            }
                                                                         }
                                                                     }
-                                                                }
 
+                                                                }
                                                             }
+
                                                         }
                                                     } else {
                                                         int numberCount = 0;
@@ -3483,23 +3502,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                             }else {
                                                 String id = sarBussionessStand.getFileId();
                                                 AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                String theSame = isTheSame(byId.getOldFileName(), bid);
-                                                if (theSame.equals("1")) {
-                                                    //证明找到文件名称一致的了
-                                                    OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                    //原文译文 进行判断
-                                                    if(sortSign != null) {
-                                                        if (sortSign.getSortSign().contains("译")) {
-                                                            if (StringUtils.isNotBlank(yi)) {
-                                                                yi = yi+"," + sarBussionessStand.getFileId();
+                                                if(byId!=null){
+                                                    String theSame = isTheSame(byId.getOldFileName(), bid);
+                                                    if (theSame.equals("1")) {
+                                                        //证明找到文件名称一致的了
+                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                        //原文译文 进行判断
+                                                        if(sortSign != null) {
+                                                            if (sortSign.getSortSign().contains("译")) {
+                                                                if (StringUtils.isNotBlank(yi)) {
+                                                                    yi = yi+"," + sarBussionessStand.getFileId();
+                                                                } else {
+                                                                    yi = sarBussionessStand.getFileId();
+                                                                }
                                                             } else {
-                                                                yi = sarBussionessStand.getFileId();
-                                                            }
-                                                        } else {
-                                                            if (StringUtils.isNotBlank(yuan)) {
-                                                                yuan = yuan+"," + sarBussionessStand.getFileId();
-                                                            } else {
-                                                                yuan = sarBussionessStand.getFileId();
+                                                                if (StringUtils.isNotBlank(yuan)) {
+                                                                    yuan = yuan+"," + sarBussionessStand.getFileId();
+                                                                } else {
+                                                                    yuan = sarBussionessStand.getFileId();
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -3528,28 +3549,31 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                                     //循环调用每一个 文件 获取文件名称
                                                     String id = fileId;
                                                     AttFileEO byId = attFileEOService.getFileInfo(id);
-                                                    String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
-                                                    if (theSame.equals("1")) {
-                                                        //证明找到文件名称一致的了
-                                                        OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                                        //原文译文 进行判断
-                                                        if(sortSign != null) {
-                                                            if (sortSign.getSortSign().contains("译")) {
-                                                                if (StringUtils.isNotBlank(yi)) {
-                                                                    yi = yi+"," + fileId;
+                                                    if(byId!=null){
+                                                        String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
+                                                        if (theSame.equals("1")) {
+                                                            //证明找到文件名称一致的了
+                                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                            //原文译文 进行判断
+                                                            if(sortSign != null) {
+                                                                if (sortSign.getSortSign().contains("译")) {
+                                                                    if (StringUtils.isNotBlank(yi)) {
+                                                                        yi = yi+"," + fileId;
+                                                                    } else {
+                                                                        yi = fileId;
+                                                                    }
                                                                 } else {
-                                                                    yi = fileId;
-                                                                }
-                                                            } else {
-                                                                if (StringUtils.isNotBlank(yuan)) {
-                                                                    yuan = yuan+"," + fileId;
-                                                                } else {
-                                                                    yuan = fileId;
-                                                                }
+                                                                    if (StringUtils.isNotBlank(yuan)) {
+                                                                        yuan = yuan+"," + fileId;
+                                                                    } else {
+                                                                        yuan = fileId;
+                                                                    }
 
+                                                                }
                                                             }
                                                         }
                                                     }
+
                                                 }
                                             } else {
                                                 int numberCount = 0;
@@ -3644,23 +3668,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                                         //循环调用每一个 文件 获取文件名称
                                         String id = sarBussionessStand.getFileId();
                                         AttFileEO byId = attFileEOService.getFileInfo(id);
-                                        String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
-                                        if (theSame.equals("1")) {
-                                            //证明找到文件名称一致的了
-                                            OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
-                                            //原文译文 进行判断
-                                            if(sortSign != null) {
-                                                if (sortSign.getSortSign().contains("译")) {
-                                                    if (StringUtils.isNotBlank(yi)) {
-                                                        yi = yi+"," + sarBussionessStand.getFileId();
+                                        if(byId!=null){
+                                            String theSame = isTheSame(byId.getOldFileName(), sarBussionessStand.getBuildId());
+                                            if (theSame.equals("1")) {
+                                                //证明找到文件名称一致的了
+                                                OldSystem sortSign = sarStandardsInfoDao.loreDepotSort(oldSystem.getSortId());
+                                                //原文译文 进行判断
+                                                if(sortSign != null) {
+                                                    if (sortSign.getSortSign().contains("译")) {
+                                                        if (StringUtils.isNotBlank(yi)) {
+                                                            yi = yi+"," + sarBussionessStand.getFileId();
+                                                        } else {
+                                                            yi = sarBussionessStand.getFileId();
+                                                        }
                                                     } else {
-                                                        yi = sarBussionessStand.getFileId();
-                                                    }
-                                                } else {
-                                                    if (StringUtils.isNotBlank(yuan)) {
-                                                        yuan = yuan+"," + sarBussionessStand.getFileId();
-                                                    } else {
-                                                        yuan = sarBussionessStand.getFileId();
+                                                        if (StringUtils.isNotBlank(yuan)) {
+                                                            yuan = yuan+"," + sarBussionessStand.getFileId();
+                                                        } else {
+                                                            yuan = sarBussionessStand.getFileId();
+                                                        }
                                                     }
                                                 }
                                             }