diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
index a63aba7d7c..98212741d9 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@@ -321,7 +321,7 @@ public class SysUserRest implements SysUserFeign {
         String captcha = redisUtil.get(uuid);
         List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
-        /*if (StringUtils.isEmpty(verifyCode)) {
+        if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
         }
 
@@ -386,8 +386,51 @@ public class SysUserRest implements SysUserFeign {
             isCorrect = true;
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
-        }*/
+        }
+
+        if (StringUtils.isBlank(userName)) {
+            return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
+        }
+        if (StringUtils.isBlank(password)) {
+            return new ResultBean<SysUserVo>().fail().setMsg("密码不能为空");
+        }
+        SysUser user = null;
+        // 验证通过之后删除redis上的验证过的该条uuid
+        user = sysUserService.selectByUserName(userName);
+        String md5 = Encodes.md5(password);
+        if (user == null) {
+            //根据手机号查询用户是否存在
+            user = sysUserService.selectByMobile(userName);
+            if (user == null) {
+                return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+            } else {
+                if (!md5.equals(user.getPassword())) {
+                    return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+                }
+            }
+        } else {
+            if (!(md5.equals(user.getPassword()))) {
+                return new ResultBean<SysUserVo>().fail().setMsg("用户名或密码错误");
+            }
+        }
+        // 根据用户信息查询用户的角色信息
+        SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
+        SystemLog systemLog = new SystemLog();
+        systemLog.setUserName(user.getUserName());
+        String ip = WebUtil.getIpAddr(httpServletRequest);
+        systemLog.setUserIp(ip);
+        systemLog.setEventUrl("portal/v1/sysuser/login");
+        systemLog.setEventContent("用户登录");
+        systemLog.setEventName("用户登录");
+        systemLogService.save(systemLog);
+        return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
+    }
 
+    @Override
+    public ResultBean<SysUserVo> loginByNoVeriCode(SysUserQuery userQuery) {
+
+        String userName = userQuery.getUserName();
+        String password = userQuery.getPassword();
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
         }
@@ -424,6 +467,7 @@ public class SysUserRest implements SysUserFeign {
         systemLog.setEventName("用户登录");
         systemLogService.save(systemLog);
         return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
+
     }
 
     @Override