|
@@ -1,20 +1,14 @@
|
|
|
package com.warewms.system.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-import javax.validation.Validator;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.warewms.common.annotation.DataScope;
|
|
|
import com.warewms.common.constant.UserConstants;
|
|
|
+import com.warewms.common.core.domain.base.page.PageDomain;
|
|
|
+import com.warewms.common.core.domain.base.page.TableDataInfo;
|
|
|
import com.warewms.common.core.domain.entity.SysRole;
|
|
|
import com.warewms.common.core.domain.entity.SysUser;
|
|
|
import com.warewms.common.exception.ServiceException;
|
|
|
+import com.warewms.common.service.impl.SystemService;
|
|
|
import com.warewms.common.utils.SecurityUtils;
|
|
|
import com.warewms.common.utils.StringUtils;
|
|
|
import com.warewms.common.utils.bean.BeanValidators;
|
|
@@ -22,13 +16,20 @@ import com.warewms.common.utils.spring.SpringUtils;
|
|
|
import com.warewms.system.domain.SysPost;
|
|
|
import com.warewms.system.domain.SysUserPost;
|
|
|
import com.warewms.system.domain.SysUserRole;
|
|
|
-import com.warewms.system.mapper.SysPostMapper;
|
|
|
-import com.warewms.system.mapper.SysRoleMapper;
|
|
|
-import com.warewms.system.mapper.SysUserMapper;
|
|
|
-import com.warewms.system.mapper.SysUserPostMapper;
|
|
|
-import com.warewms.system.mapper.SysUserRoleMapper;
|
|
|
+import com.warewms.system.mapper.*;
|
|
|
import com.warewms.system.service.ISysConfigService;
|
|
|
import com.warewms.system.service.ISysUserService;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
+
|
|
|
+import javax.validation.Validator;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
* 用户 业务层处理
|
|
@@ -36,7 +37,7 @@ import com.warewms.system.service.ISysUserService;
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@Service
|
|
|
-public class SysUserServiceImpl implements ISysUserService
|
|
|
+public class SysUserServiceImpl extends SystemService<SysUser> implements ISysUserService
|
|
|
{
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
|
@@ -64,16 +65,27 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
* 根据条件分页查询用户列表
|
|
|
*
|
|
|
+ *
|
|
|
+ * @param pageDomain
|
|
|
* @param user 用户信息
|
|
|
* @return 用户信息集合信息
|
|
|
*/
|
|
|
@Override
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
- public List<SysUser> selectUserList(SysUser user)
|
|
|
+ public TableDataInfo<SysUser> selectUserList(PageDomain pageDomain, SysUser user)
|
|
|
{
|
|
|
+ Page<SysUser> page = convertToPage(pageDomain);
|
|
|
+ return getDataTable(userMapper.selectUserList(page, user));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @DataScope(deptAlias = "d", userAlias = "u")
|
|
|
+ public List<SysUser> selectUserList(SysUser user) {
|
|
|
return userMapper.selectUserList(user);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 根据条件分页查询已分配用户角色列表
|
|
|
*
|
|
@@ -541,4 +553,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
}
|
|
|
return successMsg.toString();
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ public QueryWrapper<SysUser> getWrapper(Map<String, Object> params) {
|
|
|
+ return null;
|
|
|
+ }*/
|
|
|
}
|