优化：公共更新es方法 空指针异常

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -2505,15 +2505,18 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     //整合新旧数据
                     Bean.copyExistPropertis(newData, oldData);
                     //处理施工单位信息[去重]
-                    if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
-                        if(!oldUscUnitCreditCode.contains(newUscUnitCreditCode)){
-                            oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
-                            oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
+                    if(!ValidationUtil.isEmpty(newUscUnitCreditCode)){
+                        if (!ValidationUtil.isEmpty(oldUscUnitCreditCode)) {
+                            if(!oldUscUnitCreditCode.contains(newUscUnitCreditCode)){
+                                oldData.setUSC_UNIT_CREDIT_CODE(oldUscUnitCreditCode + "," + newUscUnitCreditCode);
+                                oldData.setUSC_UNIT_NAME(oldUscUnitName + "," + newUscUnitName);
+                            }
+                        }else {
+                            oldData.setUSC_UNIT_CREDIT_CODE(newUscUnitCreditCode);
+                            oldData.setUSC_UNIT_NAME(newUscUnitName);
                         }
-                    }else {
-                        oldData.setUSC_UNIT_CREDIT_CODE(newUscUnitCreditCode);
-                        oldData.setUSC_UNIT_NAME(newUscUnitName);
                     }
+
                 }
                 if (!ObjectUtils.isEmpty(oldData)) {
                     oldData.setREC_DATE(System.currentTimeMillis());