--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberServiceImpl.java

@@ -98,6 +98,8 @@ public class FgMemberServiceImpl  extends BaseServiceImpl<Member,Integer> implem
 		}else if (m.getLevel() == LevelEnum.ORGAN.getCode()){
 			OrganMember om = omapper.selectByPrimaryKey(m.getId());
 			info.setOrganId(om.getOid());
+			Organ organ = fgOrganMapper.selectByPrimaryKey(om.getOid());
+			info.setRelatedResourceTypes(organ.getRelatedResourceTypes());
 		}
 		return info;
 	}

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

@@ -32,6 +32,7 @@ import sun.misc.BASE64Encoder;
 import tk.mybatis.mapper.entity.Example;
 
 import com.zrqx.core.constant.member.MemberRequestPath;
+import com.zrqx.core.enums.member.LevelEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.member.fg.permissions.BindForm;
 import com.zrqx.core.form.member.fg.permissions.LoginForm;
@@ -105,7 +106,7 @@ public class FgPermissionsController {
 		return CallBack.success(errorCount);
 	}
 	
-	@ApiOperation(value = "用户登录", notes = "0：登录成功；1：账号或密码不能为空；2：验证码不能为空；3：验证码有误；4：账号或密码错误，msg返回错误次数；5：该账户已禁用;6：账号不存在，请重新输入！")
+	@ApiOperation(value = "用户登录", notes = "0：登录成功；1：账号或密码不能为空；2：验证码不能为空；3：验证码有误；4：账号或密码错误，msg返回错误次数；5：该账户已禁用;6：账号不存在，请重新输入！7:请通过个人账号登陆")
 	@PostMapping(value = MemberRequestPath.LOGIN)
 	public CallBack<LoginMemberInfo> login(@RequestBody LoginForm form,HttpServletRequest request) throws BaseException, Exception {
 		if (StringUtils.isBlank(form.getAccount()) || StringUtils.isBlank(form.getPassword())) {
@@ -126,8 +127,17 @@ public class FgPermissionsController {
 				}
 			}
 		}
-		// WAP端
-		if(form.getChannel() != null && form.getChannel() == 1){
+		// APP端
+		if(form.getChannel() != null && (form.getChannel() == 2 || form.getChannel() == 3)){
+			// 机构用户不让登陆
+			Member m = mService.login(form.getAccount());
+			if (m != null && m.getLevel().equals(LevelEnum.ORGAN.getCode())) {
+				//记录密码错误次数 并返回
+				errorCount = StringUtils.isBlank(errorCount) ? "1" : Integer.parseInt(errorCount) + 1 + "";
+				redis.set(ip,errorCount, 60 * 5);
+				llService.save(form.getAccount(), ip, 0, form.getChannel(), "请通过个人账号登陆");
+				throw new BaseException(7,errorCount,"请通过个人账号登陆");
+			}
 			//账号或密码错误 3次以上 需填写验证码
 			if (StringUtils.isNotBlank(errorCount) && Integer.parseInt(errorCount) > 3) {
 				if (form.getCode() == null) {
@@ -649,7 +659,9 @@ public class FgPermissionsController {
 			llService.save(form.getAccount(), ip, 0, form.getChannel(), "验证码有误");
 			return false;
 		}
-		redis.delete(form.getUuid());
+    	if(StringUtils.isNotBlank(form.getUuid())){
+    		redis.delete(form.getUuid());
+    	}
 		return true;
     }
 }