解决页面上 联系人 姓名为NULL的BUG

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -537,6 +537,9 @@ public class BmsEventOrderService {
                         hisVO.setHasAudioUrl(true);
                     }
                 }
+                if (hisVO.getLogObjectName() == null){
+                    hisVO.setLogObjectName("");
+                }
                 result.add(hisVO);
             });
         }
@@ -559,6 +562,9 @@ public class BmsEventOrderService {
                 OrderContactorVO contactorVO = new OrderContactorVO();
                 BeanUtil.copyProperties(item, contactorVO);
                 contactorVO.setStatusDesc(ContactorStatusEnum.getCodeToName(item.getStatus()));
+                if (contactorVO.getContactName() == null){
+                    contactorVO.setContactName("");
+                }
                 result.add(contactorVO);
             });
         }

src/main/java/com/care/client/service/PinanbaoService.java

@@ -418,6 +418,9 @@ public class PinanbaoService {
                 OrderContactorVO contactorVO = new OrderContactorVO();
                 BeanUtil.copyProperties(item,contactorVO);
                 contactorVO.setStatusDesc(ContactorStatusEnum.getCodeToName(item.getStatus()));
+                if (contactorVO.getContactName() == null){
+                    contactorVO.setContactName("");
+                }
                 result.add(contactorVO);
             });
         }
@@ -440,6 +443,9 @@ public class PinanbaoService {
             datas.forEach(item ->{
                 OrderHandleHisVO hisVO = new OrderHandleHisVO();
                 BeanUtil.copyProperties(item,hisVO);
+                if (hisVO.getLogObjectName() == null){
+                    hisVO.setLogObjectName("");
+                }
                 orderHandleHisVOList.add(hisVO);
             });
         }

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -454,7 +454,7 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                 orderContactStatus.setContactRole(UserRoleEnum.CONTACT.getValue());
                 orderContactStatus.setContactId(item.getId());
                 orderContactStatus.setStatus(ContactorStatusEnum.WEI_LIAN_XI.getValue());
-                orderContactStatus.setContactName(item.getContactName());
+                orderContactStatus.setContactName(StrUtil.isNotEmpty(item.getContactName())?item.getContactName():item.getContactPhone());
                 orderContactStatus.setContactPhone(item.getContactPhone());
                 orderContactStatus.setLongitude(item.getLongitude());
                 orderContactStatus.setLatitude(item.getLatitude());

src/main/java/com/care/keeper/service/KeeperOrderApiService.java

@@ -214,6 +214,9 @@ public class KeeperOrderApiService {
                 OrderOlderVO orderOlderVO = new OrderOlderVO();
                 BeanUtil.copyProperties(item,orderOlderVO);
                 orderOlderVO.setStatusDesc(OrderOlderStatusEnum.getCodeToName(orderOlderVO.getStatus()));
+                if (orderOlderVO.getName() == null){
+                    orderOlderVO.setName("");
+                }
                 orderOlderVOList.add(orderOlderVO);
             });
         }
@@ -238,6 +241,9 @@ public class KeeperOrderApiService {
                 HouseContactVO vo = new HouseContactVO();
                 BeanUtil.copyProperties(careHouseContact,vo);
                 vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
+                if (vo.getContactName() == null){
+                    vo.setContactName("");
+                }
                 vos.add(vo);
             });
         }