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 e887543fa..42529224b 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 @@ -5007,14 +5007,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List 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 + "
"; - } - } + List 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 + "
"; + } + } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); @@ -5022,13 +5022,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List 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 + "
"; - } - } + } + List 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 + "
"; + } + } //实施类别 if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { @@ -5037,25 +5038,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl"; - - List 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 + "
"; - } - } + } + List 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 + "
"; + } + } //在产车实施日期 if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { List 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 + "
"; + } List listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); - String infoDiffOldEn = listEn.get(0); - String infoDiffNewEn = listEn.get(1); - contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "
"; - enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "
"; + 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 + "
"; + } } //新车型实施日期