|
@@ -354,20 +354,17 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public boolean checkAdminRole(List<String> roles,String mobile) {
|
|
|
|
|
- Admin a=null;
|
|
|
|
|
- if (StringUtils.isNotBlank(mobile)) a=adminMapper.selectByMobile(mobile);
|
|
|
|
|
|
|
+ public boolean checkAdminRole(List<String> roles, Admin admin) {
|
|
|
List<UserRole> list=userRoleMapper. selectAdminRole(AFTConstants.CONSULTANT_MANAGER);
|
|
List<UserRole> list=userRoleMapper. selectAdminRole(AFTConstants.CONSULTANT_MANAGER);
|
|
|
-
|
|
|
|
|
if (!roles.isEmpty()) {
|
|
if (!roles.isEmpty()) {
|
|
|
for (String s : roles) {
|
|
for (String s : roles) {
|
|
|
if (list.size()>0) {
|
|
if (list.size()>0) {
|
|
|
- if (null==a) {
|
|
|
|
|
|
|
+ if (null==admin) {
|
|
|
if (list.get(0).getRid().equals(s)) {
|
|
if (list.get(0).getRid().equals(s)) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
}else {
|
|
}else {
|
|
|
- if (list.get(0).getRid().equals(s)&&!list.get(0).getUid().equals((a.getId()))) {
|
|
|
|
|
|
|
+ if (list.get(0).getRid().equals(s)&&!list.get(0).getUid().equals((admin.getId()))) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|