Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwCommonServiceImpl.java

@@ -297,6 +297,9 @@ public class FgwCommonServiceImpl implements IFgwCommonService {
         FgwJdapDw fgwJdapDw = new FgwJdapDw();
         fgwJdapDw.setDeptType("0");
         List<FgwJdapDw> fgwJdapDwList = fgwJdapDwMapper.selectFgwJdapDwList(fgwJdapDw);
+        if(fgwJdapDwList == null || fgwJdapDwList.size()<=0){
+            return AjaxResult.success(zMap);
+        }
         Map<String, List<FgwJdapDw>> fgwJdapDwMap = fgwJdapDwList.stream().collect(Collectors.groupingBy(FgwJdapDw::getDeptName));
         List<Long> jdapIdList = fgwJdapDwList.stream().map(FgwJdapDw::getDeptId).collect(Collectors.toList());
         //查找所有未完成的节点