From 9ec5c36c39d01119918a17f761a49fb133a5c630 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 09 Mar 2022 13:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index fd5438e..8369b2b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -347,6 +347,9 @@
user.setHold("2");
}
}
+ if (user.getHold().equals("2")){
+ states = true;
+ }
//如果是离职
if (null != user.getStatus()) {
@@ -1235,6 +1238,8 @@
user.setHold("2");
user.setSecuritynumber(null);
}
+ }else {
+ state = true;
}
String url = "";
--
Gitblit v1.9.3