Merge branch 'feature/xgh/20250609' into 'master'

非空判断

See merge request !3046

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

@@ -908,6 +908,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         Date startTime =  DateUtil.addNumForSecond(sendTime,-30) ;
         Date endTime = DateUtil.addNumForMinute(sendTime,2) ;
         TabHaobanStaff staff =  this.staffMapper.selectByPrimaryKey(staffId) ;
+        if(null == staff) {
+            return null ;
+        }
         String wxEnterpriseId = staff.getWxEnterpriseId() ;
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         String wxUserId = staff.getWxUserId() ;