|
|
@ -17,11 +17,11 @@ import com.ruoyi.system.service.ISysConfigService;
|
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.validation.Validator;
|
|
|
|
import javax.validation.Validator;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
@ -35,19 +35,19 @@ import java.util.stream.Collectors;
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|
public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
protected Validator validator;
|
|
|
|
protected Validator validator;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private SysUserMapper userMapper;
|
|
|
|
private SysUserMapper userMapper;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private SysRoleMapper roleMapper;
|
|
|
|
private SysRoleMapper roleMapper;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private SysPostMapper postMapper;
|
|
|
|
private SysPostMapper postMapper;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private SysUserRoleMapper userRoleMapper;
|
|
|
|
private SysUserRoleMapper userRoleMapper;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private SysUserPostMapper userPostMapper;
|
|
|
|
private SysUserPostMapper userPostMapper;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private ISysConfigService configService;
|
|
|
|
private ISysConfigService configService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|