Commit a176c432 by 徐高华

Merge branch 'feature/xgh/202506迭代' into 'master'

Feature/xgh/202506迭代

See merge request !3087
parents 30016b1c 796eae4d
......@@ -1278,6 +1278,9 @@ public class GroupChatServiceImpl implements GroupChatService {
@Override
public ServiceResponse<Void> initStaffGroupChat(String staffId) {
TabHaobanStaff staff = this.staffMapper.selectByPrimaryKey(staffId);
if(null == staff) {
return ServiceResponse.failure("9999", "员工不存在");
}
String userId = staff.getWxUserId();
String wxEnterpriseId = staff.getWxEnterpriseId();
WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
......
......@@ -404,7 +404,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
}
private void send(TabQwMomentPlan plan) {
if(plan.getDeleteFlag()==1 || plan.getStatusFlag()!=1 || plan.getEndDate().getTime()<=System.currentTimeMillis()) {
if(null == plan || plan.getDeleteFlag()==1 || plan.getStatusFlag()!=1 || plan.getEndDate().getTime()<=System.currentTimeMillis()) {
logger.info("计划已停止={}",plan.getPlanId());
return;
}
......
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