|
@@ -111,10 +111,10 @@ public class LaserService {
|
|
|
}
|
|
|
if(param.getUserId() != null){ //客户场景
|
|
|
User user = userService.getById(param.getUserId());
|
|
|
- newParam.setPhone("no-user");
|
|
|
- if(user != null){
|
|
|
- newParam.setPhone(user.getUserName());
|
|
|
+ if(user == null){
|
|
|
+ return null;
|
|
|
}
|
|
|
+ newParam.setPhone(user.getUserName());
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(param.getCompanyName())){ //客户场景
|
|
|
List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyName(param.getCompanyName());
|
|
@@ -132,6 +132,9 @@ public class LaserService {
|
|
|
}else {
|
|
|
param.setSnCodes(snCodes);
|
|
|
}
|
|
|
+ if(param.getSnCodes() == null || param.getSnCodes().size()<=0){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
|
|
BeanUtils.copyProperties(param,newParam);
|
|
|
newParam.setTitle(param.getSceneName());
|