|
@@ -103,7 +103,7 @@ public class ReservationSchoolController {
|
|
|
queryWrapper2
|
|
queryWrapper2
|
|
|
.select(XjrWorkflowOperateRecord::getId)
|
|
.select(XjrWorkflowOperateRecord::getId)
|
|
|
.select(XjrWorkflowOperateRecord.class, x -> VoToColumnUtil.fieldsToColumns(XjrWorkflowOperateRecord.class).contains(x.getProperty()))
|
|
.select(XjrWorkflowOperateRecord.class, x -> VoToColumnUtil.fieldsToColumns(XjrWorkflowOperateRecord.class).contains(x.getProperty()))
|
|
|
- .leftJoin(WorkflowFormRelation.class, WorkflowFormRelation::getProcessId, NewsRelation::getUserId)
|
|
|
|
|
|
|
+ .leftJoin(WorkflowFormRelation.class, WorkflowFormRelation::getProcessId, XjrWorkflowOperateRecord::getProcessId)
|
|
|
.eq(WorkflowFormRelation::getFormKeyValue, record.getId())
|
|
.eq(WorkflowFormRelation::getFormKeyValue, record.getId())
|
|
|
.disableSubLogicDel();
|
|
.disableSubLogicDel();
|
|
|
List<XjrWorkflowOperateRecord> list = operateRecordService.selectJoinList(XjrWorkflowOperateRecord.class, queryWrapper2 );
|
|
List<XjrWorkflowOperateRecord> list = operateRecordService.selectJoinList(XjrWorkflowOperateRecord.class, queryWrapper2 );
|