From 41aaa0cc7c5fe00724be8fa44764a1fbc0c46dc9 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期三, 09 十月 2024 08:44:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java index b2fd87d..15f37fe 100644 --- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java +++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/controller/admin/IndItemController.java @@ -95,11 +95,11 @@ if (ItemTypeEnum.ATOM.getCode().equals(entity.getItemType())){ respVO.setAtomItem(indItemAtomService.getByItemId(entity.getId())); }else if (ItemTypeEnum.DER.getCode().equals(entity.getItemType())){ - IndItemDerVo derItem = indItemDerService.getByItemId(entity.getId()); + IndItemDerVO derItem = indItemDerService.getByItemId(entity.getId()); respVO.setDerItem(derItem); respVO.setAtomItem(indItemAtomService.get(derItem.getAtomItemId())); }else if (ItemTypeEnum.CAL.getCode().equals(entity.getItemType())){ - respVO.setCalItem(indItemCalService.getByItemId(entity.getId()) == null ? new IndItemCalVo() : indItemCalService.getByItemId(entity.getId())); + respVO.setCalItem(indItemCalService.getByItemId(entity.getId()) == null ? new IndItemCalVO() : indItemCalService.getByItemId(entity.getId())); } return success(respVO); } -- Gitblit v1.9.3