|
@@ -56,7 +56,7 @@ public class ShotPictureExecutors {
|
|
|
try {
|
|
|
if(!CollectionUtils.isEmpty(dataList) && Objects.nonNull(dataList.get(0))){
|
|
|
if (Boolean.parseBoolean(dataList.get(0).getDictLabel())) {
|
|
|
- if(CollectionUtils.isEmpty(addressDataList) || Objects.isNull(addressDataList.get(0))){
|
|
|
+ if(!CollectionUtils.isEmpty(addressDataList) && Objects.nonNull(addressDataList.get(0))){
|
|
|
address = addressDataList.get(0).getDictLabel();
|
|
|
}
|
|
|
taskService.getNormalPicture(address);
|
|
@@ -88,7 +88,7 @@ public class ShotPictureExecutors {
|
|
|
try {
|
|
|
if(!CollectionUtils.isEmpty(dataList) && Objects.nonNull(dataList.get(0))){
|
|
|
if (Boolean.parseBoolean(dataList.get(0).getDictLabel())) {
|
|
|
- if(CollectionUtils.isEmpty(addressDataList) || Objects.isNull(addressDataList.get(0))){
|
|
|
+ if(!CollectionUtils.isEmpty(addressDataList) && Objects.nonNull(addressDataList.get(0))){
|
|
|
address = addressDataList.get(0).getDictLabel();
|
|
|
}
|
|
|
taskService.getAlarmPicture(address);
|