diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java index 868a625b1..baa2afb3b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemChangeCategoryDTO.java @@ -21,5 +21,7 @@ public class ItemChangeCategoryDTO implements Serializable { private String categoryFullId; + private String fistCategoryId; + private String categoryLabel; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 70a11aec2..fcbb35c3f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -5041,11 +5041,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem public Result changeCategory(ItemChangeCategoryDTO dto) { ItemEntity itemEntity = baseDao.selectById(dto.getItemId()); if (itemEntity!=null){ - itemEntity.setCategoryCode(dto.getCategoryId()); - itemEntity.setCategoryFullCode(dto.getCategoryFullId()); - if (StringUtils.isNotBlank(dto.getCategoryLabel())){ + if (StringUtils.isNotBlank(dto.getCategoryId())){ + itemEntity.setCategoryCode(dto.getCategoryId()); + } + if (StringUtils.isNotBlank(dto.getCategoryFullId())) { + itemEntity.setCategoryFullCode(dto.getCategoryFullId()); + }else{ + itemEntity.setCategoryFullCode(null); + } + if (StringUtils.isNotBlank(dto.getCategoryLabel())) { itemEntity.setCategoryFullName(dto.getCategoryLabel()); } + if (StringUtils.isNotBlank(dto.getFistCategoryId())) { + itemEntity.setFirstCategoryCode(dto.getFistCategoryId()); + } baseDao.updateById(itemEntity); }else { throw new RenException("该item不存在" + dto.getItemId());