|
|
@@ -2,6 +2,7 @@ package com.xjrsoft.module.teacher.controller;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
@@ -63,7 +64,7 @@ public class TeacherbaseManagerController {
|
|
|
.like(StrUtil.isNotBlank(dto.getMobile()),XjrUser::getMobile,dto.getMobile())
|
|
|
.like(StrUtil.isNotBlank(dto.getName()),XjrUser::getName,dto.getName())
|
|
|
.like(StrUtil.isNotBlank(dto.getEmail()),XjrUser::getEmail,dto.getEmail())
|
|
|
- .eq(UserDeptRelation::getDeptId, dto.getOrgId())
|
|
|
+ .eq(ObjectUtil.isNotNull(dto.getOrgId()), UserDeptRelation::getDeptId, dto.getOrgId())
|
|
|
.orderByDesc(XjrUser::getId)
|
|
|
.select(XjrUser::getId)
|
|
|
.select(XjrUser.class,x -> VoToColumnUtil.fieldsToColumns(XjrUserPageVo.class).contains(x.getProperty()))
|