rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod/20260204' into develop

This commit is contained in:
曹鹏飞 2026-02-04 09:58:36 +08:00
parent bcfe4c3ea4 775691fe9e
commit 7b03defe07
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -918,7 +918,6 @@ public class TicketController extends ControllerBase {
@GetMapping("getSolutionMeasures") @GetMapping("getSolutionMeasures")
@ApiMark(moduleName = "工单管理", apiName = "获取工单解决方案措施") @ApiMark(moduleName = "工单管理", apiName = "获取工单解决方案措施")
public ApiResult<SolutionMeasuresVO> getSolutionMeasures(@Valid @RequestParam @NotNull Long ticketId) { public ApiResult<SolutionMeasuresVO> getSolutionMeasures(@Valid @RequestParam @NotNull Long ticketId) {
return ApiResult.success(ticketSolutionService.getSolutionMeasures(ticketId)); return ApiResult.success(ticketSolutionService.getSolutionMeasures(ticketId));
} }

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
View File

@ -133,12 +133,10 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
} }
} }
vo.setMeasures(items); vo.setMeasures(items);
if (Objects.equals(ticket.getType(), 1)) {
DeviceInfoVO deviceInfoVO = deviceService.getByDeviceNo(ticket.getDeviceNo()); DeviceInfoVO deviceInfoVO = deviceService.getByDeviceNo(ticket.getDeviceNo());
if (Objects.nonNull(deviceInfoVO)) { if (Objects.nonNull(deviceInfoVO)) {
vo.setComponents(deviceInfoVO.getComponents()); vo.setComponents(deviceInfoVO.getComponents());
} }
}
return vo; return vo;
} }