Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/CompanyDingdingServiceImpl.java

@@ -379,7 +379,12 @@ public class CompanyDingdingServiceImpl extends ServiceImpl<CompanyDingdingMappe
         msg.getOa().getBody().setContent(content);
         msg.getOa().getBody().setForm(form);
         msg.setMsgtype("oa");
-        List<String> collect = form.stream().map(f -> f.getKey()).collect(Collectors.toList());
+        List<String> collect;
+        if(form!=null){
+            collect= form.stream().map(f -> f.getKey()).collect(Collectors.toList());
+        }else {
+            collect=new ArrayList<>();
+        }
         if(collect.contains("里程碑:")){
             msg.getOa().setMessageUrl("dingtalk://dingtalkclient/action/openapp?corpid="+dingding.getCorpid()
                     +"&container_type=work_platform&app_id=0_"+dingding.getAgentId()+"&redirect_type=jump&redirect_url="+ URLEncoder.encode(dingding.getWebUrl()+"?corpid="+dingding.getCorpid()+"&jumpto=/info/"+projectId));