逻辑修改

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@@ -70,6 +70,11 @@ public class ProjectDetailResultDTO implements Serializable {
 	 */
 	private List<String> platformIds;
 
+	public ProjectDetailResultDTO() {
+		this.processable = false;
+		this.isSend = false;
+	}
+
 	@NoArgsConstructor
 	@Data
 	public static class DepartmentNameListBean {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -310,20 +310,22 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
 				//TODO external_system值为1时，根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录，
 				// 如果没有记录或者INTERNAL_STATUS是closed，processable的值为true
-				if (parameterValue.equals(NumConstant.ONE_STR)) {
-					List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
-					// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
-					ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
-					if (null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) {
-						resultDTO.setProcessable(true);
-						resultDTO.setIsSend(true);
+				if (StringUtils.isNotEmpty(parameterValue)){
+					if (parameterValue.equals(NumConstant.ONE_STR)) {
+						List<String> projectStaffIds = departmentList.stream().map(m -> m.getProjectStaffId()).distinct().collect(Collectors.toList());
+						// 根据departmentList里的projectStaffId在project_sub_process表找最新的一条记录
+						ProjectSubProcessDTO projectSubProcessDTO = projectSubProcessService.selectSubProcess(projectStaffIds);
+						if (null == projectSubProcessDTO || projectSubProcessDTO.getInternalStatus().equals(ProjectConstant.CLOSED)) {
+							resultDTO.setProcessable(true);
+							resultDTO.setIsSend(true);
+						} else {
+							resultDTO.setProcessable(false);
+							resultDTO.setIsSend(false);
+						}
 					} else {
-						resultDTO.setProcessable(false);
+						resultDTO.setProcessable(true);
 						resultDTO.setIsSend(false);
 					}
-				} else {
-					resultDTO.setProcessable(true);
-					resultDTO.setIsSend(false);
 				}
 			} else {
 				resultDTO.setProcessable(false);