--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -268,7 +268,12 @@ public class FgPermissionsController {
 			throw new BaseException(9,"第三方账号不能为空");
 		}
 		LoginMemberInfo	info =null;
-		Member m = mService.loginQQ(form.getQqKey());
+		Member m = null;
+		if(StringUtils.isNotBlank(form.getQqKey())) {
+			m = mService.loginQQ(form.getQqKey());
+		}else if(StringUtils.isNotBlank(form.getQqKey())) {
+			m = mService.loginWechat(form.getWechatKey());
+		}
 		if(m!=null) {
 			info = mService.isLevelLogin(m);
 			String token = MD5Util.getEncoderByMd5(m.getAccount());
@@ -299,7 +304,7 @@ public class FgPermissionsController {
 			if(StringUtils.isNotBlank(form.getQqKey())) {
 				member.setQqKey(form.getQqKey());
 			}
-			if(StringUtils.isNotBlank(form.getQqKey())) {
+			if(StringUtils.isNotBlank(form.getWechatKey())) {
 				member.setWechatKey(form.getWechatKey());
 			}
 			if(!mService.updateByPrimaryKeySelective(member)) {