|
|
@@ -170,13 +170,13 @@ public class HomeController extends BaseController { |
|
|
if(StringUtils.isNotBlank(user.getPhone())) { |
|
|
if(StringUtils.isNotBlank(user.getPhone())) { |
|
|
// 领导登录 |
|
|
// 领导登录 |
|
|
user = mallUserInfoService.getByPhone(user.getPhone()); |
|
|
user = mallUserInfoService.getByPhone(user.getPhone()); |
|
|
if(user == null && !isInMobileAdmin(user)) { |
|
|
|
|
|
|
|
|
if(user == null || !isInMobileAdmin(user)) { |
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
} |
|
|
} |
|
|
} else if(StringUtils.isNotBlank(user.getOpenId())) { |
|
|
} else if(StringUtils.isNotBlank(user.getOpenId())) { |
|
|
// 领导登录 |
|
|
// 领导登录 |
|
|
user = mallUserInfoService.getByOpenId(user.getOpenId()); |
|
|
user = mallUserInfoService.getByOpenId(user.getOpenId()); |
|
|
if(!isInMobileAdmin(user)) { |
|
|
|
|
|
|
|
|
if(user == null || !isInMobileAdmin(user)) { |
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
|