|
@@ -122,6 +122,7 @@ public class MaterialTaskController {
|
|
|
.or()
|
|
|
.eq(MaterialTaskAssign::getStatus, 4))
|
|
|
.select(MaterialTask::getId)
|
|
|
+ .selectAs(MaterialTask::getMaterialTypeId, MaterialTaskWaitPageVo::getMaterialId)
|
|
|
.select(MaterialTask.class, x -> VoToColumnUtil.fieldsToColumns(MaterialTaskWaitPageVo.class).contains(x.getProperty()))
|
|
|
.innerJoin(MaterialTaskAssign.class, MaterialTaskAssign::getMaterialTaskId, MaterialTask::getId, ext -> ext.eq(MaterialTaskAssign::getUserId, StpUtil.getLoginIdAsLong()))
|
|
|
.selectAs(MaterialTaskAssign::getId, MaterialTaskWaitPageVo::getAssignId)
|