diff --git a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java index 83f8702a3b..2741d6d5b9 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XWecomServer.java @@ -78,7 +78,6 @@ public class XWecomServer { ModelAndView modelAndView = new ModelAndView("redirect:/"); HttpServletResponse response = ServletUtils.response(); WecomXpackService wecomXpackService = null; - String idToken = null; try { Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((WecomXpackService.class)); if (beansOfType.keySet().size() == 0) { @@ -123,7 +122,7 @@ public class XWecomServer { try { msg = URLEncoder.encode(msg, "UTF-8"); LogUtil.error(e); - Cookie cookie_error = new Cookie("OidcError", msg); + Cookie cookie_error = new Cookie("WecomError", msg); cookie_error.setPath("/"); return modelAndView; diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java index ef24dfd05f..ea994e15f9 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -139,7 +139,7 @@ public class SysUserService { sysUser.setCreateTime(now); sysUser.setUpdateTime(now); - sysUser.setEnabled((ObjectUtils.isNotEmpty(userMap.get("status")) && 1 == Integer.parseInt(userMap.get("status").toString())) ? 1L : 0L); + sysUser.setEnabled((ObjectUtils.isNotEmpty(userMap.get("status")) && 1 == Integer.parseInt(userMap.get("status").toString().split("\\.")[0])) ? 1L : 0L); sysUser.setGender((ObjectUtils.isEmpty(userMap.get("gender")) || "1".equals(userMap.get("gender"))) ? "男" : "女"); sysUser.setLanguage("zh_CN"); sysUser.setFrom(4);