|
@@ -267,14 +267,11 @@ public class MaterialTypeServiceImpl extends MPJBaseServiceImpl<MaterialTypeMapp
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private FormTemplate getFormTemplateById(Long formReleaseId) {
|
|
private FormTemplate getFormTemplateById(Long formReleaseId) {
|
|
|
- MPJLambdaWrapper<FormTemplate> formTemplateLambdaQueryWrapper = new MPJLambdaWrapper<>();
|
|
|
|
|
|
|
+ LambdaQueryWrapper<FormTemplate> formTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
formTemplateLambdaQueryWrapper
|
|
formTemplateLambdaQueryWrapper
|
|
|
- .disableSubLogicDel()
|
|
|
|
|
- .disableLogicDel()
|
|
|
|
|
.orderByDesc(FormTemplate::getSortCode)
|
|
.orderByDesc(FormTemplate::getSortCode)
|
|
|
.select(FormTemplate.class, x -> VoToColumnUtil.fieldsToColumns(FormTemplate.class).contains(x.getProperty()))
|
|
.select(FormTemplate.class, x -> VoToColumnUtil.fieldsToColumns(FormTemplate.class).contains(x.getProperty()))
|
|
|
- .leftJoin(FormRelease.class, FormRelease::getFormId, FormTemplate::getId)
|
|
|
|
|
- .eq(FormRelease::getId, formReleaseId);
|
|
|
|
|
|
|
+ .eq(FormTemplate::getId, formReleaseId);
|
|
|
return formTemplateService.getOne(formTemplateLambdaQueryWrapper);
|
|
return formTemplateService.getOne(formTemplateLambdaQueryWrapper);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|