Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/controller/AccountController.java

@@ -84,7 +84,7 @@ public class AccountController {
         if (user == null)
             throw new BaseException(BaseErrorEnum.USER_PASSWORD_ERROR);
 
-        if (!Arrays.asList(appLoginUserType).contains(user.getUserTypeId()))
+        if (!Arrays.asList(appLoginUserType).contains(user.getUserTypeId()) || !userService.isSiteUser(user.getUserId()))
             throw new BaseException("10004","请使用驿站工作者账号登录！");
 
         user.token = TokenUtils.sign(user.getUserId() + '|' + user.getUserTypeId());

src/main/java/com/hz/employmentsite/services/impl/UserServiceImpl.java

@@ -386,4 +386,13 @@ public class UserServiceImpl implements UserService {
         return dbData;
     }
 
+    public boolean isSiteUser(String userId) {
+        SysUserSysRoleExample exp = new SysUserSysRoleExample();
+        SysUserSysRoleExample.Criteria cri = exp.or();
+        cri.andUserIDEqualTo(userId);
+        cri.andRoleIDEqualTo(siteRoleId);
+
+        return sysUserSysRoleMapper.selectByExample(exp).size() > 0;
+    }
+
 }

src/main/java/com/hz/employmentsite/services/service/UserService.java

@@ -34,4 +34,6 @@ public interface UserService {
 
     SysUser addSiteUser(String userId,String loginId, String name, String createUserId);
 
+    boolean isSiteUser(String userId);
+
 }