Commit d4047090 authored by 刘凡's avatar 刘凡

优化:公共更新es方法

parent bfa56274
...@@ -2505,7 +2505,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -2505,7 +2505,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//整合新旧数据 //整合新旧数据
Bean.copyExistPropertis(newData, oldData); Bean.copyExistPropertis(newData, oldData);
//处理施工单位信息[去重] //处理施工单位信息[去重]
if (!StringUtils.isEmpty(oldUscUnitCreditCode)) { if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
if(!oldUscUnitCreditCode.contains(newUscUnitCreditCode)){ if(!oldUscUnitCreditCode.contains(newUscUnitCreditCode)){
oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode); oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName); oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
...@@ -2528,5 +2528,4 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD ...@@ -2528,5 +2528,4 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return resultMap; return resultMap;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment