|
@@ -100,13 +100,14 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
|
|
|
return AjaxResult.error("当前版本ID不存在!");
|
|
|
}
|
|
|
BeanUtils.copyProperties(baseCameraVersion, baseCameraVersionVo);
|
|
|
- LambdaQueryWrapper<BaseVersionCameraParam> wrapperBaseVersionCameraParam = new LambdaQueryWrapper<>();
|
|
|
- if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getId())) {
|
|
|
- wrapperBaseVersionCameraParam.eq(BaseVersionCameraParam::getVersionId, baseCameraVersionVo.getId());
|
|
|
+ if ("3".equals(baseCameraVersion.getUpgradeType())) {
|
|
|
+ LambdaQueryWrapper<BaseVersionCameraParam> wrapperBaseVersionCameraParam = new LambdaQueryWrapper<>();
|
|
|
+ if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getId())) {
|
|
|
+ wrapperBaseVersionCameraParam.eq(BaseVersionCameraParam::getVersionId, baseCameraVersionVo.getId());
|
|
|
+ }
|
|
|
+ List<BaseVersionCameraParam> baseVersionCameraParams = baseVersionCameraParamMapper.selectList(wrapperBaseVersionCameraParam);
|
|
|
+ baseCameraVersionVo.setBaseVersionCameraParamList(baseVersionCameraParams);
|
|
|
}
|
|
|
- List<BaseVersionCameraParam> baseVersionCameraParams = baseVersionCameraParamMapper.selectList(wrapperBaseVersionCameraParam);
|
|
|
- baseCameraVersionVo.setBaseVersionCameraParamList(baseVersionCameraParams);
|
|
|
-
|
|
|
CameraUpdateLog cameraUpdateLog = new CameraUpdateLog();
|
|
|
cameraUpdateLog.setVersionId(baseCameraVersion.getId());
|
|
|
cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());
|