Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -104,11 +106,14 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
             List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
             Map<String, Object> instanceMap = Bean.listToMap(list, "fieldCode", "fieldValue", DynamicFormInstance.class);
             for (DynamicFormColumn optionModel : columns) {
-                DynamicFormInstance dyFormInstance =
-                        list.stream().filter(i -> i.getFieldCode().equals(optionModel.getFieldCode())).findFirst().get();
-                instanceMap.put(optionModel.getFieldCode(), instanceMap.get(optionModel.getFieldCode()));
-                if ("radio,select,treeSelect".contains(optionModel.getFieldType())) {
-                    instanceMap.put(optionModel.getFieldCode() + "Label", dyFormInstance.getFieldValueLabel());
+                Optional<DynamicFormInstance> first = list.stream().filter(i -> i.getFieldCode().equals(optionModel.getFieldCode())).findFirst();
+                if (first.isPresent()){
+                    DynamicFormInstance dyFormInstance =
+                            first.get();
+                    instanceMap.put(optionModel.getFieldCode(), instanceMap.get(optionModel.getFieldCode()));
+                    if ("radio,select,treeSelect".contains(optionModel.getFieldType())) {
+                        instanceMap.put(optionModel.getFieldCode() + "Label", dyFormInstance.getFieldValueLabel());
+                    }
                 }
             }
             optionListMap.putAll(instanceMap);