|
@@ -45,18 +45,26 @@ public class UserAuthLoginManage { |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
public UserFullInfoDTO queryUserInfoInPhoneNoAuth(String phoneNo) { |
|
|
public UserFullInfoDTO queryUserInfoInPhoneNoAuth(String phoneNo) { |
|
|
UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class) |
|
|
|
|
|
.eq(UserInfo::getMobile, phoneNo)); |
|
|
|
|
|
if (Objects.isNull(userInfo)) { |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class) |
|
|
|
|
|
// .eq(UserInfo::getMobile, phoneNo)); |
|
|
|
|
|
// if (Objects.isNull(userInfo)) { |
|
|
|
|
|
// return null; |
|
|
|
|
|
// } |
|
|
|
|
|
// |
|
|
|
|
|
// UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
|
|
|
// userFullInfoDTO.setCompanyId(1L); |
|
|
|
|
|
// userFullInfoDTO.setUserId(userInfo.getId()); |
|
|
|
|
|
// userFullInfoDTO.setIdentifier(userInfo.getRealName()); |
|
|
|
|
|
// userFullInfoDTO.setRealName(userInfo.getRealName()); |
|
|
|
|
|
// userFullInfoDTO.setUsername(userInfo.getRealName()); |
|
|
|
|
|
// return userFullInfoDTO; |
|
|
|
|
|
|
|
|
UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
userFullInfoDTO.setCompanyId(1L); |
|
|
userFullInfoDTO.setCompanyId(1L); |
|
|
userFullInfoDTO.setUserId(userInfo.getId()); |
|
|
|
|
|
userFullInfoDTO.setIdentifier(userInfo.getRealName()); |
|
|
|
|
|
userFullInfoDTO.setRealName(userInfo.getRealName()); |
|
|
|
|
|
userFullInfoDTO.setUsername(userInfo.getRealName()); |
|
|
|
|
|
|
|
|
userFullInfoDTO.setUserId(1L); |
|
|
|
|
|
userFullInfoDTO.setIdentifier("123456"); |
|
|
|
|
|
userFullInfoDTO.setRealName("测试账号"); |
|
|
|
|
|
userFullInfoDTO.setUsername("测试账号"); |
|
|
return userFullInfoDTO; |
|
|
return userFullInfoDTO; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@@ -67,17 +75,25 @@ public class UserAuthLoginManage { |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
public UserFullInfoDTO queryUserInfoInAccountIdAuth(String accountId) { |
|
|
public UserFullInfoDTO queryUserInfoInAccountIdAuth(String accountId) { |
|
|
UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class) |
|
|
|
|
|
.eq(UserInfo::getAccountId, accountId)); |
|
|
|
|
|
if (Objects.isNull(userInfo)) { |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// UserInfo userInfo = iUserInfoService.getOne(Wrappers.lambdaQuery(UserInfo.class) |
|
|
|
|
|
// .eq(UserInfo::getAccountId, accountId)); |
|
|
|
|
|
// if (Objects.isNull(userInfo)) { |
|
|
|
|
|
// return null; |
|
|
|
|
|
// } |
|
|
|
|
|
// UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
|
|
|
// userFullInfoDTO.setCompanyId(1L); |
|
|
|
|
|
// userFullInfoDTO.setUserId(userInfo.getId()); |
|
|
|
|
|
// userFullInfoDTO.setIdentifier(userInfo.getRealName()); |
|
|
|
|
|
// userFullInfoDTO.setRealName(userInfo.getRealName()); |
|
|
|
|
|
// userFullInfoDTO.setUsername(userInfo.getRealName()); |
|
|
|
|
|
// return userFullInfoDTO; |
|
|
|
|
|
|
|
|
UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
UserFullInfoDTO userFullInfoDTO = new UserFullInfoDTO(); |
|
|
userFullInfoDTO.setCompanyId(1L); |
|
|
userFullInfoDTO.setCompanyId(1L); |
|
|
userFullInfoDTO.setUserId(userInfo.getId()); |
|
|
|
|
|
userFullInfoDTO.setIdentifier(userInfo.getRealName()); |
|
|
|
|
|
userFullInfoDTO.setRealName(userInfo.getRealName()); |
|
|
|
|
|
userFullInfoDTO.setUsername(userInfo.getRealName()); |
|
|
|
|
|
|
|
|
userFullInfoDTO.setUserId(1L); |
|
|
|
|
|
userFullInfoDTO.setIdentifier("123456"); |
|
|
|
|
|
userFullInfoDTO.setRealName("测试账号"); |
|
|
|
|
|
userFullInfoDTO.setUsername("测试账号"); |
|
|
return userFullInfoDTO; |
|
|
return userFullInfoDTO; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |