diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index eb79ea948..dfc132eed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5269,10 +5269,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = new LinkedList<>(); @@ -5960,14 +5960,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl phasedImplDetailsList = Arrays.asList(value.split("#")); for (String phasedImplDetails : phasedImplDetailsList) { PhasedImplementationDetailsEO phasedImplementationDetailsEO = new PhasedImplementationDetailsEO(); - String[] phasedImplDetailsArr = phasedImplDetails.split("

"); + String[] phasedImplDetailsArr = phasedImplDetails.split(""); if(phasedImplDetailsArr.length >= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; - if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { + if(StringUtils.isEmpty(standNumberOrClause)){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; + }else{ + errorMsg += "Phased Implementation Details - Regulation No./clause cannot be empty,"; + } + countError++; + } else if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { if(CutEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; }else{ - errorMsg += "Details of the phased implementation standNumberOrClause Can not be more than " + 200 + " char, "; + errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; } countError++; }else { @@ -5976,6 +5983,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 2){ String implementationTypeName = phasedImplDetailsArr[1]; + if(StringUtils.isNotEmpty(implementationTypeName)){ String[] implementationTypeNameArr = implementationTypeName.split(","); ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values(); @@ -5993,30 +6001,47 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 3){ - Date implementationDate = null; - try { - implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); - } catch (ParseException e) { - e.printStackTrace(); - } - if(implementationDate == null){ + String implementationDateStr = phasedImplDetailsArr[2]; + if(StringUtils.isEmpty(implementationDateStr)){ if(CutEnum.CN.getValue().equals(cut)){ - errorMsg += "分阶段实施详情-实施日期格式错误,正确格式为'yyyy-MM-dd', "; + errorMsg += "分阶段实施详情-实施日期不能为空, "; }else{ - errorMsg += "Details of the phased implementation implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + errorMsg += "Phased Implementation Details - Implementation Date cannot be empty,"; } countError++; }else { - phasedImplementationDetailsEO.setImplementationDate(implementationDate); + Date implementationDate = null; + try { + implementationDate = DateUtils.parseDate(phasedImplDetailsArr[2], "yyyy-MM-dd"); + } catch (ParseException e) { + e.printStackTrace(); + } + if(implementationDate == null){ + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += "分阶段实施详情-实施日期格式错误,正确格式为'yyyy-MM-dd', "; + }else{ + errorMsg += "Phased Implementation Details - implementationDate format is incorrect. The correct format is 'yyyy-MM-dd', "; + } + countError++; + }else { + phasedImplementationDetailsEO.setImplementationDate(implementationDate); + } } } if(phasedImplDetailsArr.length >= 4){ @@ -6025,7 +6050,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl