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

Feature/xgh/202506迭代

See merge request !3091

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

@@ -103,6 +103,9 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
                         dto.setStoreGroupId(map.get(storeId).getStoreGroupId());
                         dto.setStoreGroupName(map.get(storeId).getStoreGroupName());
                     }
+                    if(dto.getSendStatus()==3) {
+                        dto.setSendStatus(1);
+                    }
                 });
             }
         }

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

@@ -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);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -407,7 +407,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;
         }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -149,7 +149,12 @@
   	  where 
   	  	a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and a.delete_flag = 0
   	  	<if test="null != sendStatus">
-  	  		and send_status = #{sendStatus}
+  	    	<if test="sendStatus==1">
+				and send_status in (1,3)
+			</if>
+			<if test="sendStatus==2">
+				and send_status = 2
+			</if>
   	  	</if>
   	  	<if test="null != searchParams and ''!=searchParams">
   	  		and b.staff_name like #{searchParams}