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

Merge remote-tracking branch '惠信/develop' into develop

This commit is contained in:
曹鹏飞 2025-03-05 19:06:17 +08:00
parent 5370a20d4a aa6ca8aa56
commit d0910837b6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceComponentController.java
View File

@ -108,7 +108,9 @@ public class DeviceComponentController extends ControllerBase {
public ApiResult<Boolean> setPart(@Valid @RequestBody DeviceComponentDTO component){ public ApiResult<Boolean> setPart(@Valid @RequestBody DeviceComponentDTO component){
if(CollUtil.isEmpty(component.getComponent())){ if(CollUtil.isEmpty(component.getComponent())){
throw new NflgException(STATE.ParamErr,"机型部件不能为空"); //清空机型部件
deviceComponentDetailService.delByComponentId(component.getId());
return ApiResult.success(true);
} }
DeviceComponent ent = Convert.convert(DeviceComponent.class, component); DeviceComponent ent = Convert.convert(DeviceComponent.class, component);
List<String> compinets = component.getComponent().stream().map(u -> u.getPartName()).collect(Collectors.toList()); List<String> compinets = component.getComponent().stream().map(u -> u.getPartName()).collect(Collectors.toList());

1
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceComponentDTO.java
View File

@ -23,6 +23,5 @@ public class DeviceComponentDTO {
/** /**
* 机型部件-多个以逗号隔开 * 机型部件-多个以逗号隔开
*/ */
@NotEmpty(message = "机型部件不能为空")
private List<DeviceComponentDetailDTO> component; private List<DeviceComponentDetailDTO> component;
} }