|
@@ -1,6 +1,5 @@
|
|
|
package com.ydtech.modules.admin.service.impl;
|
|
package com.ydtech.modules.admin.service.impl;
|
|
|
|
|
|
|
|
-import cn.dev33.satoken.stp.StpUtil;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
@@ -15,13 +14,13 @@ import com.ydtech.core.page.PageResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.constants.QuMarks;
|
|
import com.ydtech.modules.admin.constants.QuMarks;
|
|
|
import com.ydtech.modules.admin.constants.RoleConstants;
|
|
import com.ydtech.modules.admin.constants.RoleConstants;
|
|
|
|
|
+import com.ydtech.modules.admin.constants.SystemType;
|
|
|
import com.ydtech.modules.admin.constants.UserWorkStatus;
|
|
import com.ydtech.modules.admin.constants.UserWorkStatus;
|
|
|
import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
import com.ydtech.modules.admin.dao.SysUserMapper;
|
|
|
import com.ydtech.modules.admin.model.*;
|
|
import com.ydtech.modules.admin.model.*;
|
|
|
import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.QuUserNumDto;
|
|
import com.ydtech.modules.admin.model.dto.QuUserNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
-import com.ydtech.modules.admin.model.po.KztDataPermission;
|
|
|
|
|
import com.ydtech.modules.admin.model.po.SysUserIsDial;
|
|
import com.ydtech.modules.admin.model.po.SysUserIsDial;
|
|
|
import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
|
|
import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
|
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
@@ -34,7 +33,6 @@ import com.ydtech.modules.esm.model.EsmUserReferrer;
|
|
|
import com.ydtech.modules.esm.model.vo.EsmUserImageVo;
|
|
import com.ydtech.modules.esm.model.vo.EsmUserImageVo;
|
|
|
import com.ydtech.modules.esm.service.EsmUserImageService;
|
|
import com.ydtech.modules.esm.service.EsmUserImageService;
|
|
|
import com.ydtech.modules.esm.service.EsmUserReferrerService;
|
|
import com.ydtech.modules.esm.service.EsmUserReferrerService;
|
|
|
-import com.ydtech.modules.ins.model.yc.ruote.Base;
|
|
|
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
|
import com.ydtech.utils.StringUtils;
|
|
import com.ydtech.utils.StringUtils;
|
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
@@ -49,6 +47,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
|
|
public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
|
|
|
|
|
+
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysMenuService sysMenuService;
|
|
private SysMenuService sysMenuService;
|
|
|
|
|
|
|
@@ -85,6 +84,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysUserTrackService sysUserTrackService;
|
|
private SysUserTrackService sysUserTrackService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private SysPcAddressService sysPcAddressService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
|
|
public IPage<SysUserBaseVO> findUserList(PageDto<SysUserDto> pageDto) {
|
|
|
PageVo<SysUserBaseVO> pageVo = new PageVo();
|
|
PageVo<SysUserBaseVO> pageVo = new PageVo();
|
|
@@ -1607,4 +1609,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
public List<String> getTelemarketingPersonnelData() {
|
|
public List<String> getTelemarketingPersonnelData() {
|
|
|
return baseMapper.getTelemarketingPersonnelUserId();
|
|
return baseMapper.getTelemarketingPersonnelUserId();
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void saveLoginIpAddr(String systemType) {
|
|
|
|
|
+ if (SystemType.ST_1.getCode().equals(systemType)) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ sysPcAddressService.saveSysPcAddress();
|
|
|
|
|
+ }catch (Exception e){}
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|