Commit 11a31deda35338d9dcabed3195c717218da03bb7
1 parent
a00934c7
迁移到 24
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 { | @@ -120,7 +120,7 @@ public class WebServiceProxy implements CommandLineRunner { | ||
| 120 | * @return | 120 | * @return |
| 121 | */ | 121 | */ |
| 122 | public static String[] mergerJccData(String[] newData, String[] oldData, String companyId){ | 122 | public static String[] mergerJccData(String[] newData, String[] oldData, String companyId){ |
| 123 | - if(oldSysLines == null || oldSysLines.size() == 0) | 123 | + if(oldSysLines == null || oldSysLines.size() == 0 || oldData == null) |
| 124 | return newData; | 124 | return newData; |
| 125 | 125 | ||
| 126 | List<String> rs = new ArrayList<>(); | 126 | List<String> rs = new ArrayList<>(); |