|
@@ -894,7 +894,11 @@ public class CommonFacade {
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (propertyName.equals("UniqueName")) {
|
|
if (propertyName.equals("UniqueName")) {
|
|
- BeanUtils.copyProperty(item, "uniqueName", name);
|
|
|
|
|
|
+ if(StringUtil.isNotBlank(hisDetailName)){
|
|
|
|
+ BeanUtils.copyProperty(item, "uniqueName", hisDetailName);
|
|
|
|
+ }else {
|
|
|
|
+ BeanUtils.copyProperty(item, "uniqueName", name);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
retList.add(item);
|
|
retList.add(item);
|
|
}
|
|
}
|