app任务列表bug,日志排序bug

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

@@ -94,7 +94,7 @@ public class ContractLogController extends BladeController {
             @ApiImplicitParam(name = "time", value = "所选的时间，格式为yyyy-MM-dd、yyyy-MM、yyyy")
     })
     public R<List<ContractLog>> queryLogByContractIdAndNodePrimaryKeyId(@RequestParam String contractId, @RequestParam String nodePrimaryKeyId, @RequestParam String time) {
-        return R.data(this.contractLogService.list(Wrappers.<ContractLog>lambdaQuery().eq(ContractLog::getContractId, contractId).eq(ContractLog::getWbsNodeId, nodePrimaryKeyId).like(ContractLog::getRecordTime, time)));
+        return R.data(this.contractLogService.list(Wrappers.<ContractLog>lambdaQuery().eq(ContractLog::getContractId, contractId).eq(ContractLog::getWbsNodeId, nodePrimaryKeyId).like(ContractLog::getRecordTime, time).orderByDesc(ContractLog::getRecordTime)));
     }
 
     /**

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

@@ -204,7 +204,7 @@ public class TaskController extends BladeController {
 			Map<String, Task> masterTaskMap = new HashMap<>();
 			masterTaskList.forEach(task -> masterTaskMap.put(task.getProcessInstanceId(), task));
 
-			R<Object> rObject = this.newFlowClient.selectSendPage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType(), String.join(",", processInstanceIds));
+			R<Object> rObject = this.newFlowClient.selectSendPage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType()==null?1:queryVO.getOrdType(), String.join(",", processInstanceIds));
 			if(rObject.isSuccess()){
 				Query query = new Query();
 				query.setCurrent(queryVO.getCurrent());
@@ -354,7 +354,7 @@ public class TaskController extends BladeController {
 		this.integrationMethod(queryVO, masterTaskMap, parallelMap, parallelProcessInstanceIds, "2,3");
 
 		//获取已办（基于原生已办）
-		R<Object> rObject = this.newFlowClient.selectDonePage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
+		R<Object> rObject = this.newFlowClient.selectDonePage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType()==null?1:queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
 		//处理参数
 		return this.integrationMethod(queryVO, rObject, masterTaskMap, parallelMap, false);
 	}
@@ -388,7 +388,7 @@ public class TaskController extends BladeController {
 		this.integrationMethod(queryVO, masterTaskMap, parallelMap, parallelProcessInstanceIds, "1");
 
 		//获取待办(基于原生待办)
-		R<Object> rObject = this.newFlowClient.selectTodoPage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
+		R<Object> rObject = this.newFlowClient.selectTodoPage(queryVO.getCurrent(), queryVO.getSize(),queryVO.getOrdType()==null?1:queryVO.getOrdType(), String.join(",", parallelProcessInstanceIds));
 		//处理参数
 		return this.integrationMethod(queryVO, rObject, masterTaskMap, parallelMap, true);
 	}