Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java =================================================================== diff -u -r13979 -r14193 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java (.../IDCardInstanceUtils.java) (revision 13979) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcardinstance/util/IDCardInstanceUtils.java (.../IDCardInstanceUtils.java) (revision 14193) @@ -96,9 +96,12 @@ Long idCardInstanceID = idCardInstance.getId(); IDCardDefinition idCardDefinition = idCardInstance.getIDCardDefinition(objectDao); try{ - if( idCardDefinition != null && idCardDefinition.getTousseDefinition(objectDao) != null) + if( idCardDefinition != null) { TousseDefinition tousseDefinition = idCardDefinition.getTousseDefinition(objectDao); + if(tousseDefinition == null){ + return false; + } int intervalTime = tousseDefinition.getMaintainIntervalTime(); int intervalCount = tousseDefinition.getMaintainIntervalCount(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r14100 -r14193 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14100) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 14193) @@ -321,15 +321,23 @@ } public void setMaintainIntervalTime(Integer maintainIntervalTime) { - this.maintainIntervalTime = maintainIntervalTime; + if(maintainIntervalTime == null){ + this.maintainIntervalTime = 0; + }else{ + this.maintainIntervalTime = maintainIntervalTime; + } } public Integer getMaintainIntervalCount() { return maintainIntervalCount; } public void setMaintainIntervalCount(Integer maintainIntervalCount) { - this.maintainIntervalCount = maintainIntervalCount; + if(maintainIntervalCount == null){ + this.maintainIntervalCount = 0; + }else{ + this.maintainIntervalCount = maintainIntervalCount; + } } @OneToMany(mappedBy = "tousse", fetch = FetchType.LAZY, cascade = { CascadeType.ALL })