客户端任务查看-监理合同段可以查看所有合同段

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -31,6 +31,8 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.feign.NewFlowClient;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.feign.ContractClient;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.NewISmsClient;
 import org.springblade.system.entity.DictBiz;
@@ -79,6 +81,8 @@ public class TaskController extends BladeController {
 
 	private final CommonFileClient commonFileClient;
 
+	private final ContractClient contractClient;
+
 	/**
 	 * 记录短信验证码超时时间
 	 */
@@ -416,7 +420,9 @@ public class TaskController extends BladeController {
 		List<String> parallelProcessInstanceIds = new ArrayList<>();
 		//统合查询方法
 		this.integrationMethod(queryVO, masterTaskMap, parallelMap, parallelProcessInstanceIds, "1");
-
+		if (masterTaskMap.size() == 0){
+			return R.data(null);
+		}
 		//获取待办(基于原生待办)
 		R<Object> rObject = this.newFlowClient.selectTodoPage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType()==null?1:queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
 		//处理参数
@@ -461,7 +467,12 @@ public class TaskController extends BladeController {
 		}
 		//合同段ID
 		if(StringUtils.isNotEmpty(queryVO.getContractId())){
-			wrapper.eq(Task::getContractId, queryVO.getContractId());
+			ContractInfo contractInfo = contractClient.getContractById(Long.valueOf(queryVO.getContractId()));
+			if (contractInfo.getContractType() == 2){
+				wrapper.eq(Task::getProjectId, queryVO.getProjectId());
+			}else {
+				wrapper.eq(Task::getContractId, queryVO.getContractId());
+			}
 		}
 		//开始结束时间
 		if(StringUtils.isNotEmpty(queryVO.getStartTime()) && StringUtils.isNotEmpty(queryVO.getEndTime())){