|
@@ -3,12 +3,12 @@ package com.ruoyi.system.service.impl; |
|
@@ -3,12 +3,12 @@ package com.ruoyi.system.service.impl; |
|
3
|
import java.util.ArrayList;
|
3
|
import java.util.ArrayList;
|
|
4
|
import java.util.List;
|
4
|
import java.util.List;
|
|
5
|
import java.util.stream.Collectors;
|
5
|
import java.util.stream.Collectors;
|
|
6
|
-
|
|
|
|
7
|
import org.slf4j.Logger;
|
6
|
import org.slf4j.Logger;
|
|
8
|
import org.slf4j.LoggerFactory;
|
7
|
import org.slf4j.LoggerFactory;
|
|
9
|
import org.springframework.beans.factory.annotation.Autowired;
|
8
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
10
|
import org.springframework.stereotype.Service;
|
9
|
import org.springframework.stereotype.Service;
|
|
11
|
import org.springframework.transaction.annotation.Transactional;
|
10
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
11
|
+import org.springframework.util.CollectionUtils;
|
|
12
|
import com.ruoyi.common.annotation.DataScope;
|
12
|
import com.ruoyi.common.annotation.DataScope;
|
|
13
|
import com.ruoyi.common.constant.UserConstants;
|
13
|
import com.ruoyi.common.constant.UserConstants;
|
|
14
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
14
|
import com.ruoyi.common.core.domain.entity.SysRole;
|
|
@@ -27,7 +27,6 @@ import com.ruoyi.system.mapper.SysUserPostMapper; |
|
@@ -27,7 +27,6 @@ import com.ruoyi.system.mapper.SysUserPostMapper; |
|
27
|
import com.ruoyi.system.mapper.SysUserRoleMapper;
|
27
|
import com.ruoyi.system.mapper.SysUserRoleMapper;
|
|
28
|
import com.ruoyi.system.service.ISysConfigService;
|
28
|
import com.ruoyi.system.service.ISysConfigService;
|
|
29
|
import com.ruoyi.system.service.ISysUserService;
|
29
|
import com.ruoyi.system.service.ISysUserService;
|
|
30
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
31
|
|
30
|
|
|
32
|
/**
|
31
|
/**
|
|
33
|
* 用户 业务层处理
|
32
|
* 用户 业务层处理
|
