Browse Source

/material/materialtype/assign-page 材料提交任务类型权限列表(分页) 正常返回userName字段

phoenix 1 year ago
parent
commit
dcafdb2ae6

+ 3 - 2
src/main/java/com/xjrsoft/module/material/controller/MaterialTypeController.java

@@ -160,10 +160,11 @@ public class MaterialTypeController {
         MPJLambdaWrapper<MaterialTypeAssign> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .disableSubLogicDel()
-                .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
                 .select(MaterialTypeAssign::getId)
-                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId,ext->ext.selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName))
+                .selectAs(XjrUser::getName,MaterialTypeAssignVo::getUserName)
                 .select(MaterialTypeAssign.class,x -> VoToColumnUtil.fieldsToColumns(MaterialTypeAssignVo.class).contains(x.getProperty()))
+                .eq(ObjectUtil.isNotEmpty(dto.getMaterialTypeId()) && dto.getMaterialTypeId() > 0, MaterialTypeAssign::getMaterialTypeId, dto.getMaterialTypeId())
+                .leftJoin(MaterialType.class, MaterialType::getId, MaterialTypeAssign::getMaterialTypeId,ext->ext.selectAs(MaterialType::getName, MaterialTypeAssignVo::getMaterialTypeName))
                 .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))