|
|
|
@@ -134,6 +134,27 @@ public class HomeController extends BaseController { |
|
|
|
return data; |
|
|
|
} |
|
|
|
|
|
|
|
private boolean isInMobileAdmin(MallUserInfo user) { |
|
|
|
// 检查用户是否有 移动端数据塔台 权限 |
|
|
|
boolean isInMobile = false; |
|
|
|
MallUserRole ur = new MallUserRole(); |
|
|
|
ur.setUid(user.getId()); |
|
|
|
PageInfo<MallUserRole> page = mallUserRoleService.listAsPage(ur, 1, 1); |
|
|
|
if (page.getSize() > 0) { |
|
|
|
Long roleId = page.getList().get(0).getRoleId(); |
|
|
|
MallRolePermission p = new MallRolePermission(); |
|
|
|
p.setRoleId(roleId); |
|
|
|
p.setTenantId(user.getTenantId()); |
|
|
|
PageInfo<MallRolePermission> listAsPage = mallRolePermissionService.listAsPage(p, 1, 100); |
|
|
|
for (MallRolePermission rp : listAsPage.getList()) { |
|
|
|
if (rp.getPermissionId().equals(8L)) { /// 移动端数据塔台 |
|
|
|
isInMobile = true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return isInMobile; |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("B端登录") |
|
|
|
@PostMapping("/bHidLogin") |
|
|
|
public ResultData bLogin(@RequestBody MallUserInfo user) { |
|
|
|
@@ -142,13 +163,13 @@ public class HomeController extends BaseController { |
|
|
|
if(StringUtils.isNotBlank(user.getPhone())) { |
|
|
|
// 领导登录 |
|
|
|
user = mallUserInfoService.getByPhone(user.getPhone()); |
|
|
|
if(!user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { |
|
|
|
if(!isInMobileAdmin(user)) { |
|
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
|
} |
|
|
|
} else if(StringUtils.isNotBlank(user.getOpenId())) { |
|
|
|
// 领导登录 |
|
|
|
user = mallUserInfoService.getByOpenId(user.getOpenId()); |
|
|
|
if(!user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { |
|
|
|
if(!isInMobileAdmin(user)) { |
|
|
|
return new ResultData(ErrorCode.USER_NOT_ADMIN); |
|
|
|
} |
|
|
|
} else { |
|
|
|
|