|
@@ -161,7 +161,9 @@ public class MaterialTypeController {
|
|
|
.disableSubLogicDel()
|
|
|
.eq(MaterialTypeAssign::getMaterialTypeId,dto.getMaterialTypeId())
|
|
|
.select(MaterialTypeAssign::getId)
|
|
|
- .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
|
|
|
+ .selectAs(MaterialType::getName,MaterialTypeAssignVo::getMaterialTypeName)
|
|
|
+ .leftJoin(MaterialType.class,MaterialType::getId,MaterialTypeAssign::getMaterialTypeId)
|
|
|
+// .select(MaterialType.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
|
|
|
.innerJoin(XjrUser.class,XjrUser::getId,MaterialTypeAssign::getUserId,ext->ext.selectAs(XjrUser::getUserName,MaterialTypeAssignVo::getUserName))
|
|
|
.leftJoin(UserDeptRelation.class,UserDeptRelation::getUserId,MaterialTypeAssign::getUserId)
|
|
|
.leftJoin(Department.class,Department::getId,UserDeptRelation::getDeptId,ext->ext.selectAs(Department::getName,MaterialTypeAssignVo::getDeptName))
|