|
@@ -301,7 +301,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
uniqueName = uniqueConcept.getLibName();
|
|
uniqueName = uniqueConcept.getLibName();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return uniqueName;
|
|
|
|
|
|
+ return cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(uniqueName) : uniqueName;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -317,12 +317,12 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
if (ListUtil.isNotEmpty(res)) {
|
|
if (ListUtil.isNotEmpty(res)) {
|
|
Map<String, String> map = res.stream().collect(
|
|
Map<String, String> map = res.stream().collect(
|
|
Collectors.toMap((r -> r.getTc() + "__" + r.getMx()), (r -> r.getUniqueName())));
|
|
Collectors.toMap((r -> r.getTc() + "__" + r.getMx()), (r -> r.getUniqueName())));
|
|
- for(LisMappingSearch mappingListVO : lisMappingSearchList) {
|
|
|
|
|
|
+ for (LisMappingSearch mappingListVO : lisMappingSearchList) {
|
|
String uniqueName = map.get(mappingListVO.getMealName() + "__" + mappingListVO.getItemName());
|
|
String uniqueName = map.get(mappingListVO.getMealName() + "__" + mappingListVO.getItemName());
|
|
mappingListVO.setUniqueName(
|
|
mappingListVO.setUniqueName(
|
|
cryptConfiguer.cryptFlag ?
|
|
cryptConfiguer.cryptFlag ?
|
|
- CryptUtil.decrypt_char(uniqueName) :
|
|
|
|
- uniqueName);
|
|
|
|
|
|
+ CryptUtil.decrypt_char(uniqueName) :
|
|
|
|
+ uniqueName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return lisMappingSearchList;
|
|
return lisMappingSearchList;
|