Просмотр исходного кода

咨询师管理修改信息BUG修复

anderx лет назад: 7
Родитель
Сommit
e9b809af72

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

@@ -160,7 +160,7 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				return res;	
 			}	
 			
-			if (newAdminService.checkAdminRole(roles,admin.getMobile())) {
+			if (newAdminService.checkAdminRole(roles,admin)) {
 				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "", "咨询师管理员"));				
 				return res;	
 			}

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

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

+ 3 - 6
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -354,20 +354,17 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	}
 
 	@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);
-		
 		if (!roles.isEmpty()) {
 			for (String s : roles) {
 				if (list.size()>0) {
-					if (null==a) {
+					if (null==admin) {
 						if (list.get(0).getRid().equals(s)) {
 							return true;
 						}
 					}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;
 						}
 					}