Browse Source

修改咨询师管理员BUG修改

anderx 7 years ago
parent
commit
d2e7982191

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -96,7 +96,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));
 				return res;
 			}
-			if (newAdminService.checkAdminRole(roles)) {
+			if (newAdminService.checkAdminRole(roles,null)) {
 				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "咨询师管理员"));				
 				return res;	
 			}
@@ -162,7 +162,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				return res;	
 			}	
 			
-			if (newAdminService.checkAdminRole(roles)) {
+			if (newAdminService.checkAdminRole(roles,admin.getMobile())) {
 				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "咨询师管理员"));				
 				return res;	
 			}

+ 1 - 1
src/main/java/com/goafanti/admin/service/NewAdminService.java

@@ -68,6 +68,6 @@ public interface NewAdminService {
 
 	List<AdminListBo> selectAdminByOrg();
 
-	boolean checkAdminRole(List<String> roles);
+	boolean checkAdminRole(List<String> roles, String mobile);
 	
 }

+ 9 - 2
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

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