Просмотр исходного кода

将部门id的查询字段从orgId改为departmentId

dzx 1 год назад
Родитель
Сommit
8956d97b94

+ 1 - 1
src/main/java/com/xjrsoft/module/teacher/controller/TeacherbaseManagerController.java

@@ -64,7 +64,7 @@ public class TeacherbaseManagerController {
                 .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
                 .like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
                 .like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
                 .like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
                 .like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
                 .like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
-                .eq(ObjectUtil.isNotNull(dto.getOrgId()), UserDeptRelation::getDeptId, dto.getOrgId())
+                .eq(ObjectUtil.isNotNull(dto.getDepartmentId()), UserDeptRelation::getDeptId, dto.getDepartmentId())
                 .orderByDesc(XjrUser::getId)
                 .orderByDesc(XjrUser::getId)
                 .select(XjrUser::getId)
                 .select(XjrUser::getId)
                 .select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
                 .select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))

+ 1 - 1
src/main/java/com/xjrsoft/module/teacher/dto/XjrUserPageDto.java

@@ -41,6 +41,6 @@ public class XjrUserPageDto extends PageInput {
      * 机构id
      * 机构id
      */
      */
     @ApiModelProperty("机构id")
     @ApiModelProperty("机构id")
-    private Long orgId;
+    private Long departmentId;
 
 
 }
 }