拜访计划、商机、客户、联系人相关接口

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -15,7 +15,6 @@ import com.management.platform.service.SysFunctionService;
 import com.management.platform.service.WxCorpInfoService;
 import com.management.platform.service.impl.ExcelExportServiceImpl;
 import com.management.platform.util.HttpRespMsg;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -274,14 +273,14 @@ public class BusinessOpportunityController {
     public Object claim(BusinessOpportunity bo, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("Token"));
         HttpRespMsg msg = new HttpRespMsg();
-        String[] strings = bo.getIds().split(",");
-        for (String id : strings) {
-            BusinessOpportunity opportunity = boMapper.selectById(id);
-            if (StringUtils.isEmpty(opportunity.getInchargerId())){
-                msg.setError("商机:"+opportunity.getName()+"未被认领不能转移");
-                return msg;
-            }
-        }
+//        String[] strings = bo.getIds().split(",");
+//        for (String id : strings) {
+//            BusinessOpportunity opportunity = boMapper.selectById(id);
+//            if (StringUtils.isEmpty(opportunity.getInchargerId())){
+//                msg.setError("商机:"+opportunity.getName()+"未被认领不能转移");
+//                return msg;
+//            }
+//        }
         bOservice.getAndTransfer(bo, user);
         return msg;
     }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/VisitPlanController.java

@@ -110,12 +110,12 @@ public class VisitPlanController {
      * 获取分页数据
      * @param pageIndex
      * @param pageSize
-     * @param calenderTime
+     * @param calenderDate
      * @param request
      * @return
      */
     @PostMapping("/getVisitPlanList")
-    public HttpRespMsg getVisitPlan(@RequestParam(value = "pageIndex",required = false) Integer pageIndex
+    public HttpRespMsg getVisitPlanList(@RequestParam(value = "pageIndex",required = false) Integer pageIndex
             , @RequestParam(value = "pageSize",required = false) Integer pageSize
             ,@RequestParam("calenderDate")String calenderDate
             ,HttpServletRequest request){

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/time/VisitPlanTask.java

@@ -53,8 +53,14 @@ public class VisitPlanTask {
                 Integer companyId = entry.getKey();
                 WxCorpInfo wxCorpInfo =companyWXCorpMap.getOrDefault(companyId,null);
                 List<VisitPlan> planList = entry.getValue();
+                if(CollectionUtils.isEmpty(planList)){
+                    continue;
+                }
                 List<String> wxIds = planList.stream().filter(t -> StringUtils.isNotBlank(t.getCorpwxUserid())).map(VisitPlan::getCorpwxUserid)
                         .collect(Collectors.toList());
+                if(CollectionUtils.isEmpty(wxIds)){
+                    continue;
+                }
                 String join = StringUtils.join(wxIds, '|');
                 if (wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1&&StringUtils.isNotBlank(join)){
                     // getCorpwxUserid  以 | 隔开 可分割开放