|
@@ -877,12 +877,13 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
Pattern pattern = Pattern.compile(regex);
|
|
Pattern pattern = Pattern.compile(regex);
|
|
|
|
|
|
Map<String, IndexBatchDTO> approvalMap = new HashMap<>();
|
|
Map<String, IndexBatchDTO> approvalMap = new HashMap<>();
|
|
- for (IndexBatchDTO indexDTO : indexBatchDTOList) {
|
|
|
|
|
|
+ approvalMap = indexBatchDTOList.stream().collect(Collectors.toMap(IndexBatchDTO::getApproval, v -> v));
|
|
|
|
+ /*for (IndexBatchDTO indexDTO : indexBatchDTOList) {
|
|
Matcher matcher = pattern.matcher(indexDTO.getApproval());
|
|
Matcher matcher = pattern.matcher(indexDTO.getApproval());
|
|
if (matcher.find()) {
|
|
if (matcher.find()) {
|
|
approvalMap.put(matcher.group(), indexDTO);
|
|
approvalMap.put(matcher.group(), indexDTO);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
for (MappingConfigWrapper item : list) {
|
|
for (MappingConfigWrapper item : list) {
|
|
if (StringUtil.isBlank(item.getApproval())) {
|
|
if (StringUtil.isBlank(item.getApproval())) {
|