|
@@ -863,12 +863,12 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
continue;
|
|
|
}
|
|
|
Matcher matcher = pattern.matcher(item.getApproval());
|
|
|
- String approval = "";
|
|
|
+ /* String approval = "";
|
|
|
if (matcher.find()) {
|
|
|
approval = matcher.group();
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(approval) && approvalMap.containsKey(approval)) {
|
|
|
- IndexBatchDTO indexBatchDTO = approvalMap.get(approval);
|
|
|
+ }*/
|
|
|
+ if (StringUtils.isNotBlank(item.getApproval()) && approvalMap.containsKey(item.getApproval())) {
|
|
|
+ IndexBatchDTO indexBatchDTO = approvalMap.get(item.getApproval());
|
|
|
item.setUniqueName(indexBatchDTO.getName());
|
|
|
item.setConceptId(indexBatchDTO.getId());
|
|
|
if (indexBatchDTO.getFormConceptId() != null) {
|