|
@@ -1743,7 +1743,7 @@ public class TaskController extends BladeController {
|
|
|
if (dto.getSelectedType().equals(1)) {
|
|
|
// 待办页面逻辑
|
|
|
if (ObjectUtil.isNotEmpty(dto.getStatusValue()) && dto.getStatusValue().equals(1)) {
|
|
|
- sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND u_task_parallel.e_visa_content!='当前等待电签的批次较多,请等待几分钟后刷新页面查看........')");
|
|
|
+ sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND (u_task_parallel.e_visa_content!='当前等待电签的批次较多,请等待几分钟后刷新页面查看........' OR u_task_parallel.e_visa_content IS NULL))");
|
|
|
params.add(1);
|
|
|
params.add(SecureUtil.getUserId());
|
|
|
// 关联电签状态字段
|
|
@@ -1757,7 +1757,7 @@ public class TaskController extends BladeController {
|
|
|
return R.data(emptyPage);
|
|
|
} else {
|
|
|
// 待办页未选状态:默认查待审批
|
|
|
- sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND u_task_parallel.e_visa_content!='当前等待电签的批次较多,请等待几分钟后刷新页面查看........')");
|
|
|
+ sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND (u_task_parallel.e_visa_content!='当前等待电签的批次较多,请等待几分钟后刷新页面查看........' OR u_task_parallel.e_visa_content IS NULL))");
|
|
|
params.add(1);
|
|
|
params.add(SecureUtil.getUserId());
|
|
|
sqlString.append(" AND status = 1");
|