Merge branch 'feature-canvas' into 'master'

非空判断

See merge request !2480

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatPlanApiServiceImpl.java

@@ -104,6 +104,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     @Override
     public ServiceResponse<GroupChatPlanOwnerLogDTO> getOwnerSendInfo(Long ownerLogId) {
         TabGroupChatPlanOwnerLog log = this.groupChatPlanOwnerLogService.getById(ownerLogId);
+        if(null == log) {
+            return ServiceResponse.failure("9999","记录不存在") ;
+        }
         GroupChatPlanOwnerLogDTO dto = EntityUtil.changeEntityByJSON(GroupChatPlanOwnerLogDTO.class, log);
         if(null != dto && StringUtils.isNotBlank(dto.getClerkId())) {
             ClerkDTO clerk =  this.clerkService.getclerkById(dto.getClerkId());