Merge branch 'wyl' into 'main'

fix bug

See merge request !32

src/main/java/com/cardiff/client_project/service/UserLogin.java

@@ -33,6 +33,9 @@ public class UserLogin implements UserDetailsService {
         }
         if(object instanceof CommonAdmin){
             CommonAdmin inforByName = (CommonAdmin) object;
+            if(inforByName.getStatus()==0){
+                return User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(new SimpleGrantedAuthority("NULL")).build();
+            }
             String type = superAdminMapper.getTypeById(inforByName.getRoleId());
             SimpleGrantedAuthority authority = new SimpleGrantedAuthority(type);
             userDetails = User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(authority).build();
@@ -40,6 +43,9 @@ public class UserLogin implements UserDetailsService {
 
         if(object instanceof Hospital){
             Hospital inforByName = (Hospital) object;
+            if(inforByName.getStatus()==0){
+                return User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(new SimpleGrantedAuthority("NULL")).build();
+            }
             String type = superAdminMapper.getTypeById(inforByName.getRoleId());
             SimpleGrantedAuthority authority = new SimpleGrantedAuthority(type);
             userDetails = User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(authority).build();
@@ -47,6 +53,9 @@ public class UserLogin implements UserDetailsService {
 
         if(object instanceof Patient){
             Patient inforByName = (Patient) object;
+            if(inforByName.getStatus()==0){
+                return User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(new SimpleGrantedAuthority("NULL")).build();
+            }
             String type = superAdminMapper.getTypeById(inforByName.getRoleId());
             SimpleGrantedAuthority authority = new SimpleGrantedAuthority(type);
             userDetails = User.withUsername(inforByName.getName()).password(inforByName.getPassword()).authorities(authority).build();

src/main/resources/static/html/login.html

@@ -162,6 +162,9 @@
                     if (type == "[" + "HOSPITAL" + "]") {
                       window.location.href = "";
                     }
+                    if(type=="[" + "NULL" + "]"){
+                      window.location.href="fault.html";
+                    }
                     alert("login success");
                   }
                 }