diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index b592dd6f..edd9475f 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -224,7 +224,7 @@ public class TicketController extends ControllerBase { * @return 部件列表 */ @GetMapping("getDeviceComponents") - public ApiResult> getDeviceComponents(@RequestParam String name){ + public ApiResult> getDeviceComponents(@RequestParam String name){ return ApiResult.success(partService.getSimpleList(name)); } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ComponentInfo.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ComponentInfo.java index a81820e7..ba16530b 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ComponentInfo.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/ComponentInfo.java @@ -1,8 +1,10 @@ package com.nflg.mobilebroken.common.pojo.vo; import lombok.Data; +import lombok.experimental.Accessors; @Data +@Accessors(chain = true) public class ComponentInfo { /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePartService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePartService.java index aac1dc45..597a37b9 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePartService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBasePartService.java @@ -24,7 +24,7 @@ public interface ITBasePartService extends IService { List exportPart(@Param("partNo")String partNo, @Param("partName") String partName); - List getSimpleList(String name); + List getSimpleList(String name); List getAllDeviceComponents(String language); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePartServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePartServiceImpl.java index 3226c2e1..06282614 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePartServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBasePartServiceImpl.java @@ -44,13 +44,13 @@ public class TBasePartServiceImpl extends ServiceImpl getSimpleList(String name) { + public List getSimpleList(String name) { return lambdaQuery() .eq(TBasePart::getEnable, 1) .like(StrUtil.isNotBlank(name),TBasePart::getPartName, name) .list() .stream() - .map(TBasePart::getPartName) + .map(p->new ComponentInfo().setId(p.getId()).setName(p.getPartName())) .collect(Collectors.toList()); }