Browse Source

处理bug:交办报错

wanyuan 10 months ago
parent
commit
2b5da9766c

+ 9 - 3
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskListManagerImpl.java

@@ -1458,12 +1458,18 @@ public class TaskListManagerImpl implements ITaskListManager {
 		String currentTaskTypeId = ParameterUtil.getString(keyParam, "currentTaskTypeId");
 		data.put("category",getKeyDes(currentTaskTypeId,typeInfo));
 		TaskTypeBean currentTaskType = ParameterUtil.get(keyParam, "currentTaskType",TaskTypeBean.class);
-		if(currentTaskType.getId().equals(currentTaskType.getParentId())){
+		if(currentTaskTypeId != null && currentTaskType == null){
+			currentTaskType = taskManager.findTaskTypeBean(Long.valueOf(currentTaskTypeId));
+			keyParam.put("currentTaskType", currentTaskType);
+		}
+		if(currentTaskType != null && (currentTaskType.getParentId() == 0 ||
+				currentTaskType.getId().equals(currentTaskType.getParentId()))){
 			//一极两大三区
 			List<TaskTypeRelationBean> taskTypeRelations = AppContext.getBean(ITaskTypeRelationDao.class).getTaskTypeRelations(summary.getId());
 			if(CollectionUtil.isNotEmpty(taskTypeRelations)){
-				String categoryStr = taskTypeRelations.stream().filter(e -> !e.getTypeId().equals(currentTaskType.getId()))
-					.map(e -> getKeyDes(e.getTypeId().toString(), typeInfo)).collect(Collectors.joining("\n"));
+				TaskTypeBean finalCurrentTaskType = currentTaskType;
+				String categoryStr = taskTypeRelations.stream().filter(e -> !e.getTypeId().equals(finalCurrentTaskType.getId()))
+													  .map(e -> getKeyDes(e.getTypeId().toString(), typeInfo)).collect(Collectors.joining(","));
 				if(StringUtils.isNotEmpty(categoryStr)){
 					data.put("category", data.get("category") + "\n" + categoryStr);
 				}