新增:loginByMpWxPhone接口新增超管登录分支
This commit is contained in:
@@ -20,6 +20,7 @@ import com.gxwebsoft.common.core.utils.RedisUtil;
|
|||||||
import com.gxwebsoft.common.core.web.ApiResult;
|
import com.gxwebsoft.common.core.web.ApiResult;
|
||||||
import com.gxwebsoft.common.core.web.BaseController;
|
import com.gxwebsoft.common.core.web.BaseController;
|
||||||
import com.gxwebsoft.common.system.entity.*;
|
import com.gxwebsoft.common.system.entity.*;
|
||||||
|
import com.gxwebsoft.common.system.param.LoginParam;
|
||||||
import com.gxwebsoft.common.system.param.UserParam;
|
import com.gxwebsoft.common.system.param.UserParam;
|
||||||
import com.gxwebsoft.common.system.result.LoginResult;
|
import com.gxwebsoft.common.system.result.LoginResult;
|
||||||
import com.gxwebsoft.common.system.service.*;
|
import com.gxwebsoft.common.system.service.*;
|
||||||
@@ -27,12 +28,14 @@ import io.swagger.annotations.Api;
|
|||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN;
|
import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN;
|
||||||
@@ -110,6 +113,16 @@ public class WxLoginController extends BaseController {
|
|||||||
}
|
}
|
||||||
// 查询是否存在
|
// 查询是否存在
|
||||||
User user = userService.getByPhone(phone);
|
User user = userService.getByPhone(phone);
|
||||||
|
// 超级管理员验证
|
||||||
|
if(userParam.getIsSuperAdmin() != null){
|
||||||
|
final LoginParam loginParam = new LoginParam();
|
||||||
|
loginParam.setIsAdmin(true);
|
||||||
|
loginParam.setPhone(phone);
|
||||||
|
final List<User> adminsByPhone = userService.getAdminsByPhone(loginParam);
|
||||||
|
if (!CollectionUtils.isEmpty(adminsByPhone)) {
|
||||||
|
user = adminsByPhone.get(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
// 不存在则注册
|
// 不存在则注册
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) {
|
if ((userParam.getOpenid() == null || userParam.getOpenid().isEmpty()) && userParam.getAuthCode() != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user