|
|
@@ -4,6 +4,9 @@ import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.validation.Validator;
|
|
|
+
|
|
|
+import com.ruoyi.system.mapper.*;
|
|
|
+import com.ruoyi.system.service.ISysDeptService;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -22,11 +25,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
|
|
|
import com.ruoyi.system.domain.SysPost;
|
|
|
import com.ruoyi.system.domain.SysUserPost;
|
|
|
import com.ruoyi.system.domain.SysUserRole;
|
|
|
-import com.ruoyi.system.mapper.SysPostMapper;
|
|
|
-import com.ruoyi.system.mapper.SysRoleMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserPostMapper;
|
|
|
-import com.ruoyi.system.mapper.SysUserRoleMapper;
|
|
|
import com.ruoyi.system.service.ISysConfigService;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
|
|
|
@@ -59,6 +57,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
private ISysConfigService configService;
|
|
|
|
|
|
@Autowired
|
|
|
+ private ISysDeptService deptService;
|
|
|
+ @Autowired
|
|
|
protected Validator validator;
|
|
|
|
|
|
/**
|
|
|
@@ -71,6 +71,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
public List<SysUser> selectUserList(SysUser user)
|
|
|
{
|
|
|
+ user.setDeptId(SecurityUtils.getDeptId());
|
|
|
+// deptService.selectDeptByAncestorsOrderNum();
|
|
|
return userMapper.selectUserList(user);
|
|
|
}
|
|
|
|