迁移到 24

潘钊
1 parent a00934c7
Showing 1 changed file with 1 additions and 1 deletions
src/main/java/com/bsth/server_ws/WebServiceProxy.java
@@ -120,7 +120,7 @@ public class WebServiceProxy implements CommandLineRunner {
      * @return
      */
     public static String[] mergerJccData(String[] newData, String[] oldData, String companyId){
-        if(oldSysLines == null || oldSysLines.size() == 0)
+        if(oldSysLines == null || oldSysLines.size() == 0 || oldData == null)
             return newData;
  
         List<String> rs = new ArrayList<>();