Commit de9e5a73 authored by gaoguangjing's avatar gaoguangjing

Merge branch 'KA-29' of http://git.quantgroup.cn/head_group/xyqb-user2 into KA-29

parents 4e431c32 2244a2e7
...@@ -136,13 +136,13 @@ public class InnerController implements IBaseController { ...@@ -136,13 +136,13 @@ public class InnerController implements IBaseController {
public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) { public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) {
User user = userService.findByPhoneInDb(phoneNo); User user = userService.findByPhoneInDb(phoneNo);
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) { if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
// userId 查询对应productLogin 获取手机号和customerId // userId 查询对应productLogin 获取手机号和customerId
user = tenantService.getTenantUser(user, tenantId); user = tenantService.getTenantUser(user, tenantId);
if (user == null ) { if (user == null ) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
} }
UserRet userRet = new UserRet(user); UserRet userRet = new UserRet(user);
...@@ -157,14 +157,14 @@ public class InnerController implements IBaseController { ...@@ -157,14 +157,14 @@ public class InnerController implements IBaseController {
public JsonResult findByUuidInfo(String uuid, Integer tenantId) { public JsonResult findByUuidInfo(String uuid, Integer tenantId) {
User user = userService.findByUuidWithCache(uuid); User user = userService.findByUuidWithCache(uuid);
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) { if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(tenantId)) {
// userId 查询对应productLogin 获取手机号和customerId // userId 查询对应productLogin 获取手机号和customerId
user = tenantService.getTenantUser(user, tenantId); user = tenantService.getTenantUser(user, tenantId);
if (user == null ) { if (user == null ) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
} }
UserRet userRet = new UserRet(user); UserRet userRet = new UserRet(user);
...@@ -424,13 +424,13 @@ public class InnerController implements IBaseController { ...@@ -424,13 +424,13 @@ public class InnerController implements IBaseController {
// userId 查询对应productLogin 获取手机号和customerId // userId 查询对应productLogin 获取手机号和customerId
user = tenantService.getTenantUser(user, tenantId); user = tenantService.getTenantUser(user, tenantId);
if (user == null ) { if (user == null ) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
} }
return JsonResult.buildSuccessResult(null, new UserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
} }
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("查无此人", null);
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment