Merge branch 'feature/xgh/bug/0227' into 'master'

Feature/xgh/bug/0227

See merge request !2500

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

@@ -26,6 +26,8 @@ import com.gic.haoban.manage.service.dao.mapper.chat.*;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.content.impl.GroupMessageServiceImpl;
 import com.gic.haoban.manage.service.util.StreamUtils;
+import com.gic.haoban.task.api.dto.TaskSettingDTO;
+import com.gic.haoban.task.api.service.SettingApiService;
 import com.gic.haoban.task.manage.api.service.QywxGroupSendCanvasApiService;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
@@ -135,6 +137,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
     @Autowired
     private StaffClerkRelationService staffClerkRelationService ;
+    @Autowired
+    private SettingApiService settingApiService ;
 
     private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
 
@@ -930,7 +934,10 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             return;
         }
         for (String enterpriseId : enterpriseIdList) {
-            this.massTaskData(enterpriseId);
+            TaskSettingDTO dto = this.settingApiService.findByEnterpriseIdAndType(enterpriseId,1) ;
+            if(null != dto.getNoticeFlag() && dto.getNoticeFlag()==1) {
+                this.massTaskData(enterpriseId);
+            }
         }
     }
 

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

@@ -671,12 +671,12 @@ public class StaffApiServiceImpl implements StaffApiService {
         List<StaffClerkRelationDTO> staffRelationList = staffClerkRelationService.listByClerkIds(clerkList);
         if (CollectionUtils.isEmpty(staffRelationList)) {
             logger.error("无未绑定导购");
-            return Collections.emptyList();
+            return clerkList;
         }
         List<String> clerkIds = staffRelationList.stream().filter(s -> s.getClerkId() != null).map(s -> s.getClerkId()).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(clerkIds)) {
             logger.info("无未绑定导购id");
-            return Collections.emptyList();
+            return clerkList;
         }
         List<String> unBindList = clerkList.stream().filter(clerkId -> !clerkIds.contains(clerkId)).collect(Collectors.toList());
         logger.info("未绑定导购id：{}", JSON.toJSONString(unBindList));

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

@@ -376,8 +376,8 @@ public class GroupChatController {
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
         if (page.isSuccess() && CollUtil.isNotEmpty(page.getResult().getResult())){
             String fileName = "客户群列表数据";
-            List<String> titleList = Arrays.asList("客户群ID", "客户群名称", "群人数", "群客户数", "新增总数", "流失总数","群主","群主在好办小程序关联状态","门店名称","门店code","创建时间");
-            List<String> fileList = Arrays.asList("groupChatId", "name", "totalCount", "totalMemberCount", "addCount", "quitCount", "staffName", "clerkRelationExcel", "ownerStoreName","ownerStoreCode", "createTime");
+            List<String> titleList = Arrays.asList("客户群ID", "企微群ID","客户群名称", "群人数", "群客户数", "新增总数", "流失总数","群主","群主在好办小程序关联状态","门店名称","门店code","创建时间");
+            List<String> fileList = Arrays.asList("groupChatId", "wxChatId", "name", "totalCount", "totalMemberCount", "addCount", "quitCount", "staffName", "clerkRelationExcel", "ownerStoreName","ownerStoreCode", "createTime");
             try {
                 ExcelUtils.xls(response, request, fileName, page.getResult().getResult(), fileList, titleList);
             } catch (Exception e) {