From 8c17bd9b94e8c737ba4a7dafd699dde71387f7f7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 4 Jul 2022 15:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83--=E5=8F=91=E6=B6=88=E6=81=AF=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 390 ++++++++++--------
 1 file changed, 209 insertions(+), 181 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 83ed551b2..cbccf59d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -1213,324 +1213,352 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //标题
                     if (StringUtils.isNotBlank(infoDiff.get("title"))) {
                         List<String> list = Arrays.asList(infoDiff.get("title").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
 
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //子标题
                     if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) {
                         List<String> list = Arrays.asList(infoDiff.get("subtitle").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //WVTA ID
                     if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
                         List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //适用范围applyScope 多选
                     if (StringUtils.isNotBlank(infoDiff.get("applyScope"))) {
                         List<String> list = Arrays.asList(infoDiff.get("applyScope").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //新车型实施日期
                     if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
                         List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</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 (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //认证类型
                     if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
                         List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //技术领域
                     if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
 
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //责任领域
                     if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
                         List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //认证级别
                     if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
                         List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //实施类别
                     if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
                         List<String> list = Arrays.asList(infoDiff.get("implementType").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //适用地区region 多选
                     if (StringUtils.isNotBlank(infoDiff.get("region"))) {
                         List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
 
                     //适用增补件applicableSupplement
                     if (StringUtils.isNotBlank(infoDiff.get("applicableSupplement"))) {
                         List<String> list = Arrays.asList(infoDiff.get("applicableSupplement").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.APPLICABLE_SUPPLEMENT.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //备注
                     if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
                         List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
+
                     }
 
                     //设计符合性确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //设计符合性确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //设计符合性确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designInitiator").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //设计符合性确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designDuty").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //prehomo确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //prehomo确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //prehomo确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoInitiator").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //prehomo确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoDuty").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //验证符合性确认-交付物类型
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //验证符合性确认-交付物模板
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        }else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            }else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //验证符合性确认-发起人
                     if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyInitiator").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }
                     //验证符合性确认-责任人
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyDuty").split(","));
-                        String infoDiffOld = list.get(0);
-                        String infoDiffNew = list.get(1);
-                        if (StringUtils.isBlank(contentLog)) {
-                            contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
-
-                        } else{
-                            contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                        if(list.size() > 1){
+                            String infoDiffOld = list.get(0);
+                            String infoDiffNew = list.get(1);
+                            if (StringUtils.isBlank(contentLog)) {
+                                contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + "</br>";
+                            } else{
+                                contentLog += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
+                            }
                         }
                     }