From f4a48a5012615389575b808315d739afb2003612 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 10:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91-=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index c058412f4..da45cdff6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -4993,14 +4993,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
-						List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-
 					}
-				}
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
+					if(listEn.size() > 1){
+                        String infoDiffOldEn = listEn.get(0);
+                        String infoDiffNewEn = listEn.get(1);
+                        enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
+                }
 				//WVTA ID
 				if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
 					List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
@@ -5008,13 +5008,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
-						List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-					}
-				}
+						}
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
+					if(listEn.size() > 1){
+                        String infoDiffOldEn = listEn.get(0);
+                        String infoDiffNewEn = listEn.get(1);
+                        enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
+                }
 
 				//实施类别
 				if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
@@ -5023,25 +5024,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						String infoDiffOld = list.get(0);
 						String infoDiffNew = list.get(1);
 						contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-
-						List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
-						String infoDiffOldEn = listEn.get(0);
-						String infoDiffNewEn = listEn.get(1);
-						enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
-					}
-				}
+						}
+                    List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
+					if(listEn.size() > 1){
+                        String infoDiffOldEn = listEn.get(0);
+                        String infoDiffNewEn = listEn.get(1);
+                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
+                }
 
 				//在产车实施日期
 				if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) {
 					List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(","));
-					String infoDiffOld = list.get(0);
-					String infoDiffNew = list.get(1);
+					if(list.size() > 1){
+                        String infoDiffOld = list.get(0);
+                        String infoDiffNew = list.get(1);
+                        contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                    }
 
 					List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
-					String infoDiffOldEn = listEn.get(0);
-					String infoDiffNewEn = listEn.get(1);
-					contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
-					enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+					if(listEn.size() > 1){
+                        String infoDiffOldEn = listEn.get(0);
+                        String infoDiffNewEn = listEn.get(1);
+                        enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
+                    }
 				}
 
 				//新车型实施日期