Browse Source

解锁按钮对注销状态增加信息提示

xusl 1 year ago
parent
commit
359e930ae6

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/config/MyAuthenticationProvider.java

@@ -47,7 +47,7 @@ public class MyAuthenticationProvider extends DaoAuthenticationProvider {
                     throw new BadCredentialsException(this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
                     throw new BadCredentialsException(this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
                 }
                 }
             } catch (Exception e) {
             } catch (Exception e) {
-                log.error("用户密码解密错误,无法登录!");
+//                log.error("用户密码解密错误,无法登录!");
                 throw new BadCredentialsException(this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
                 throw new BadCredentialsException(this.messages.getMessage("AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
             }
             }
         }
         }

+ 7 - 0
ui/src/views/sysManager/userManager/index.vue

@@ -981,6 +981,13 @@ export default {
         });
         });
         return
         return
       }
       }
+      if (_selectData.status == 2) {
+        this.$message({
+          type: 'warning',
+          message: '注销的账号不能操作!'
+        });
+        return
+      }
       if (_selectData.status !== '1') {
       if (_selectData.status !== '1') {
         this.$message({
         this.$message({
           type: 'warning',
           type: 'warning',