|
|
@@ -4,16 +4,16 @@ package com.ydtech.modules.admin.service.impl;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.ydtech.constants.sys.SysPasswordEnum;
|
|
|
+import com.ydtech.exception.SystemException;
|
|
|
+import com.ydtech.modules.admin.constants.RoleConstants;
|
|
|
import com.ydtech.modules.admin.model.SysPassword;
|
|
|
import com.ydtech.modules.admin.model.SysUser;
|
|
|
-import com.ydtech.modules.admin.service.SysPasswordService;
|
|
|
-import com.ydtech.modules.admin.service.SysUserService;
|
|
|
-import com.ydtech.modules.admin.service.SysWechatWorkService;
|
|
|
+import com.ydtech.modules.admin.model.SysUserRole;
|
|
|
+import com.ydtech.modules.admin.service.*;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.modules.admin.model.SysWechatWork;
|
|
|
import com.ydtech.modules.admin.model.vo.WechatCpBindVo;
|
|
|
-import com.ydtech.modules.admin.service.WechatCpService;
|
|
|
import com.ydtech.security.utils.PasswordUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -38,6 +38,9 @@ public class WechatCpServiceImpl implements WechatCpService {
|
|
|
@Resource
|
|
|
private SysUserService sysUserService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private SysUserRoleService sysUserRoleService;
|
|
|
+
|
|
|
private final StringRedisTemplate redisTemplate;
|
|
|
|
|
|
private final SysPasswordService sysPasswordService;
|
|
|
@@ -76,6 +79,9 @@ public class WechatCpServiceImpl implements WechatCpService {
|
|
|
SysUser user = sysUserService.getById(userId);
|
|
|
|
|
|
SysUser.verifyUser(user);
|
|
|
+ if (userId.contains("M")) {
|
|
|
+ throw new SystemException("该用户不是后线人员");
|
|
|
+ }
|
|
|
SysPassword sysPassword = sysPasswordService.getOne(new LambdaQueryWrapper<SysPassword>().eq(SysPassword::getCode, SysPasswordEnum.GENERAL.getCode()));
|
|
|
if (!"admin".equals(userId) && PasswordUtils.matches(sysPassword.getSalt(), password,
|
|
|
sysPassword.getPassword())) {
|
