Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java =================================================================== diff -u -r14065 -r14071 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 14065) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 14071) @@ -482,7 +482,9 @@ * @param classifiedItem */ public void deleteClassifiedItem(ClassifiedItem classifiedItem) { - objectDao.delete(classifiedItem); + if(classifiedItem != null){ + objectDao.delete(classifiedItem); + } } /** * 删除从篮筐移除了的已分类物品 @@ -504,14 +506,20 @@ @Override public ClassifyBasket getClassifyBasketById(String id) { - return (ClassifyBasket) objectDao.getByProperty( - ClassifyBasket.class.getSimpleName(), "id", Long.valueOf(id)); + if(StringUtils.isNotBlank(id)){ + return (ClassifyBasket) objectDao.getByProperty( + ClassifyBasket.class.getSimpleName(), "id", Long.valueOf(id)); + } + return null; } @Override public ClassifiedItem getClassifiedItemById(String id) { - return (ClassifiedItem) objectDao.getByProperty( - ClassifiedItem.class.getSimpleName(), "id", Long.valueOf(id)); + if(StringUtils.isNotBlank(id)){ + return (ClassifiedItem) objectDao.getByProperty( + ClassifiedItem.class.getSimpleName(), "id", Long.valueOf(id)); + } + return null; } /** @@ -521,7 +529,9 @@ */ @Override public void deleteClassifyBasket(ClassifyBasket classifyBasket) { - objectDao.delete(classifyBasket); + if(classifyBasket != null){ + objectDao.delete(classifyBasket); + } } /**