待办中心、项目库导出修改

pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java

@@ -223,7 +223,10 @@ public class ExcelDownUtil {
                     List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME));
                     columnValue = nameList.stream().collect(Collectors.joining(StrPool.COMMA));
                 }else {
-                    columnValue = jsonObject.getString(column.toString());
+                    columnValue = String.valueOf(jsonObject.get(column.toString()));
+                }
+                if (CommonConst.NULL.equals(columnValue)){
+                    columnValue = "";
                 }
                 columnValues.add(columnValue);
             });

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -549,7 +549,7 @@ public class TodoCenterManage {
         List<Project> projects = projectLibManage.projectList(projectListReq);
         List<ProcessTaskVo> userIdoList = Lists.newArrayList();
         Map<String, Project> projectInfoMap = Maps.newHashMap();
-        if (CollUtil.isEmpty(projects)) {
+        if (CollUtil.isNotEmpty(projects)) {
             Map<Long, Project> projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v));
             // 再查出项目关联的流程实例ID
             List<Long> projectIdList = projects.stream().map(Project::getId).collect(Collectors.toList());
@@ -687,7 +687,7 @@ public class TodoCenterManage {
 
         List<ProcessInstanceVo> userSubmittedList = Lists.newArrayList();
         Map<String, Project> projectInfoMap = Maps.newHashMap();
-        if (CollUtil.isEmpty(projects)) {
+        if (CollUtil.isNotEmpty(projects)) {
             Map<Long, Project> projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v));
             // 再查出项目关联的流程实例ID
             List<Long> projectIdList = projects.stream().map(Project::getId).collect(Collectors.toList());
@@ -827,7 +827,7 @@ public class TodoCenterManage {
 
         List<ProcessInstanceVo> ccMeList = Lists.newArrayList();
         Map<String, Project> projectInfoMap = Maps.newHashMap();
-        if (CollUtil.isEmpty(projects)) {
+        if (CollUtil.isNotEmpty(projects)) {
             Map<Long, Project> projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v));
             // 再查出项目关联的流程实例ID
             List<Long> projectIdList = projects.stream().map(Project::getId).collect(Collectors.toList());