|
|
@@ -135,10 +135,12 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
|
|
|
}
|
|
|
}
|
|
|
List<Role> roleList = roleMapper.selectByIdList(roleIds);
|
|
|
- for (Role role : roleList) {
|
|
|
- if (AFTConstants.COMPANY_MANAGER.equals(role.getRoleType().toString())){
|
|
|
- flag=true;
|
|
|
- break;
|
|
|
+ if (roleList!=null){
|
|
|
+ for (Role role : roleList) {
|
|
|
+ if (AFTConstants.COMPANY_MANAGER.equals(role.getRoleType().toString())){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (flag){
|