|
|
@@ -320,11 +320,11 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
|
|
|
labHardware2.setHardwareNum(labHardware.getHardwareNum());
|
|
|
if(StringUtils.isNotBlank(labHardware2.getHardwareNum())){
|
|
|
List<LabHardwareVO> hardwareVOList = labHardwareMapper.selectLabHardwareList(labHardware2);
|
|
|
- Optional.ofNullable(hardwareVOList).orElseGet(Collections::emptyList).stream().filter(a->a.getId()!=labHardware.getId())
|
|
|
+
|
|
|
+ hardwareVOList.stream().filter(a-> !Objects.equals(a.getId(), labHardware.getId()))
|
|
|
.forEach(a->{
|
|
|
throw new ServiceException("设备编号重复,请重新输入。");
|
|
|
});
|
|
|
-
|
|
|
}
|
|
|
try{
|
|
|
id=labHardwareMapper.updateLabHardware(labHardware);
|