Merge branch 'feature/xgh/2502朋友圈' into 'master'

朋友圈校验

See merge request !2767

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

@@ -162,9 +162,9 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         if(CollectionUtils.isEmpty(list)) {
             this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), clerkIdList,"任务下发时未绑定企微号");
         }else {
-            List<String> noStaff = allList.stream().filter(o->map.keySet().contains(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(noStaff)) {
-                this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), clerkIdList,"任务下发时未绑定企微号");
+            List<String> noStaffClerkIdList = allList.stream().filter(o->map.keySet().contains(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(noStaffClerkIdList)) {
+                this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), noStaffClerkIdList,"任务下发时未绑定企微号");
             }
             List<String> successList = new ArrayList<>() ;
             for(QwMomentPlanAttendDTO dto : allList) {
@@ -176,7 +176,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
                 }
                 TabHaobanClerkMainStoreRelated tab =this.clerkMainStoreRelatedService.getMainStoreByStaffId(sid,plan.getWxEnterpriseId()) ;
                 if(null == tab || !tab.getStoreId().equals(dto.getStoreId())) {
-                    this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), clerkIdList,"任务下发时不是主门店");
+                    this.qwMomentPlanAttendMapper.updateFail(plan.getPlanId(), Arrays.asList(cid),"任务下发时不是主门店");
                     continue;
                 }
                 successList.add(cid) ;