Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java =================================================================== diff -u -r29070 -r30923 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 29070) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java (.../DepartmentAppTemplateManagerImpl.java) (revision 30923) @@ -14,6 +14,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; @@ -215,11 +216,27 @@ } } if(!existsItem){ - items.add(toAddItem); + TousseDefinitionTemplateItem tempItem = new TousseDefinitionTemplateItem(); + try { + BeanUtils.copyProperties(tempItem, toAddItem); + } catch (Exception e) { + e.printStackTrace(); + } + tempItem.setId(null); + items.add(tempItem); } } }else{ - items.addAll(toAddItems); + for (TousseDefinitionTemplateItem tousseDefinitionTemplateItem : toAddItems) { + TousseDefinitionTemplateItem tempItem = new TousseDefinitionTemplateItem(); + try { + BeanUtils.copyProperties(tempItem, tousseDefinitionTemplateItem); + } catch (Exception e) { + e.printStackTrace(); + } + tempItem.setId(null); + items.add(tempItem); + } } } } @@ -276,11 +293,27 @@ } } if(!existsItem){ - items.add(toAddItem); + DiposableGoodsTemplateItem tempItem = new DiposableGoodsTemplateItem(); + try { + BeanUtils.copyProperties(tempItem, toAddItem); + } catch (Exception e) { + e.printStackTrace(); + } + tempItem.setId(null); + items.add(tempItem); } } }else{ - items.addAll(toAddItems); + for (DiposableGoodsTemplateItem diposableGoodsTemplateItem : toAddItems) { + DiposableGoodsTemplateItem tempItem = new DiposableGoodsTemplateItem(); + try { + BeanUtils.copyProperties(tempItem, diposableGoodsTemplateItem); + } catch (Exception e) { + e.printStackTrace(); + } + tempItem.setId(null); + items.add(tempItem); + } } } } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r30921 -r30923 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 30921) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 30923) @@ -719,7 +719,7 @@ } if(!storageMap.isEmpty()){ for (int i = 0, size = jsonArray.size(); i < size; i++) { - JSONObject jsonObject = jsonArray.getJSONObject(i); + JSONObject jsonObject = jsonArray.optJSONObject(i); String tousseType = jsonObject.optString("tousseType"); if(!StringUtils.equals(DisposableGoods.TYPE_NAME, tousseType)){ Long tousseDefinitionID = jsonObject.optLong("tousseDefinitionID");