Commit c29c53a5 by 墨竹

fix:登录兼容

parent e62a7c57
...@@ -255,7 +255,8 @@ public class LoginController extends WebBaseController { ...@@ -255,7 +255,8 @@ public class LoginController extends WebBaseController {
return model; return model;
} }
//获取管理员列表 //获取管理员列表
String adminList = qywxSuiteApiService.getAdminList(enterprise.getCorpid(), application.getSiteId(), Integer.parseInt(application.getAgentId())); String corpid = enterprise.getCorpid();
String adminList = qywxSuiteApiService.getAdminList(corpid, application.getSiteId(), Integer.parseInt(application.getAgentId()));
List<String> userIds = new ArrayList<String>(); List<String> userIds = new ArrayList<String>();
if (StringUtils.isNotBlank(adminList)) { if (StringUtils.isNotBlank(adminList)) {
JSONArray jsonArr = JSON.parseArray(adminList); JSONArray jsonArr = JSON.parseArray(adminList);
...@@ -264,12 +265,20 @@ public class LoginController extends WebBaseController { ...@@ -264,12 +265,20 @@ public class LoginController extends WebBaseController {
userIds.add(json.getString("userid")); userIds.add(json.getString("userid"));
} }
} }
//兼容
if (corpid.length() > 20) {
if (!userIds.contains(staff.getWxOpenUseId())) {
logger.info("登录失败,当前用户不是管理员:{}", JSON.toJSONString(userIds));
ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
return model;
}
} else {
if (!userIds.contains(staff.getWxUserId())) { if (!userIds.contains(staff.getWxUserId())) {
logger.info("登录失败,当前用户不是管理员:{}", JSON.toJSONString(userIds)); logger.info("登录失败,当前用户不是管理员:{}", JSON.toJSONString(userIds));
ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false)); ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
return model; return model;
} }
}
LoginDTO loginDTO = new LoginDTO(); LoginDTO loginDTO = new LoginDTO();
loginDTO.setWxEnterpriseId(detailDTO.getWxEnterpriseId()); loginDTO.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
loginDTO.setStaffDTO(staff); loginDTO.setStaffDTO(staff);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment