|
@@ -326,7 +326,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
|
|
|
if (!CollectionUtils.isEmpty(patent.getMergeApplicant())) {
|
|
|
List<PatentMergePerson> mergeApplicant = patent.getMergeApplicant();
|
|
|
for (PatentMergePerson applicant : mergeApplicant) {
|
|
|
- if (mergedName.contains(applicant.getName().toLowerCase(Locale.ROOT))) {
|
|
|
+ if (mergedName.contains(applicant.getName().toUpperCase(Locale.ROOT))) {
|
|
|
applicant.setName(name);
|
|
|
applicant.setIfMerged(true);
|
|
|
applicant.setMergedNum(num);
|
|
@@ -342,7 +342,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
|
|
|
if (!CollectionUtils.isEmpty(patent.getMergeRightHolder())) {
|
|
|
List<PatentMergePerson> mergeRightHolder = patent.getMergeRightHolder();
|
|
|
for (PatentMergePerson right : mergeRightHolder) {
|
|
|
- if (mergedName.contains(right.getName().toLowerCase(Locale.ROOT))) {
|
|
|
+ if (mergedName.contains(right.getName().toUpperCase(Locale.ROOT))) {
|
|
|
right.setName(name);
|
|
|
right.setIfMerged(true);
|
|
|
right.setMergedNum(num);
|
|
@@ -360,7 +360,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
|
|
|
if (!CollectionUtils.isEmpty(patent.getMergeInventor())) {
|
|
|
List<PatentMergePerson> mergeInventor = patent.getMergeInventor();
|
|
|
for (PatentMergePerson inventor : mergeInventor) {
|
|
|
- if (mergedName.contains(inventor.getName().toLowerCase(Locale.ROOT))) {
|
|
|
+ if (mergedName.contains(inventor.getName().toUpperCase(Locale.ROOT))) {
|
|
|
inventor.setName(name);
|
|
|
inventor.setIfMerged(true);
|
|
|
inventor.setMergedNum(num);
|