|
@@ -12,10 +12,7 @@ import thyyxxk.webserver.entity.login.VueMenu;
|
|
|
import thyyxxk.webserver.entity.settings.permissions.MenuItem;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Random;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* @author dj
|
|
@@ -41,7 +38,8 @@ public class LoginService {
|
|
|
}
|
|
|
dao.insertNewUserToDjUserBase(tempUserInfo);
|
|
|
}
|
|
|
- if (!userInfo.getSid().equals("fromTriageScreen") && !userInfo.getPassword().equals(tempUserInfo.getPassword())) {
|
|
|
+ if (Objects.equals("fromTriageScreen", userInfo.getSid()) &&
|
|
|
+ !userInfo.getPassword().equals(tempUserInfo.getPassword())) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.INVALID_PASSWORD);
|
|
|
}
|
|
|
String token = tokenService.getToken(tempUserInfo);
|