|
|
@@ -3,7 +3,6 @@ package org.springblade.modules.api.controller;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.DesensitizedUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -99,9 +98,9 @@ public class ApiMerchantUserController {
|
|
|
if (!request.getPassword().equals(request.getRePassword())) {
|
|
|
return R.fail("密码不一致");
|
|
|
}
|
|
|
- User query1 = iUserService.getOne(Wrappers.<User>query().lambda().eq(User::getAccount, request.getPhone()));
|
|
|
- if (query1 != null) {
|
|
|
- return R.fail("手机号已注册！");
|
|
|
+ List<User> query1 = iUserService.lambdaQuery().eq(User::getAccount, request.getPhone()).list();
|
|
|
+ if (CollectionUtil.isNotEmpty(query1)) {
|
|
|
+ return R.fail("手机号已注册，请更换其他手机号！");
|
|
|
}
|
|
|
String tenantId = WebUtil.getRequest().getHeader(TokenUtil.TENANT_HEADER_KEY);
|
|
|
User user = new User();
|
LuoDLeo