登录修改

api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java

@@ -80,14 +80,8 @@ public class LoginController {
         if (authAdmin == null) {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
-        if (StrUtil.isEmpty(loginRequest.getImei())) {
+        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord())) &&  !PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
-            if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) {
+            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
-                throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
-            }
-        } else {
-            if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
-                throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
-            }
         }
 
         if (authAdmin.getUserFlag() == 0) {