From 76d1eda40c33320c76e4f604c053a89372e24b52 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 22 Apr 2020 11:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=8A=B6=E6=80=81=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=96=B0employee=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/service/support/EmpUserServiceSupport.java | 4 ++-- .../com/jeesite/modules/sys/web/user/EmpUserController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index 91f4e36f..2dfa6c2c 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -241,8 +241,8 @@ public class EmpUserServiceSupport extends CrudService @Override @Transactional(readOnly=false) public void updateStatus(EmpUser empUser) { - userService.delete(empUser); - employeeService.delete(empUser.getEmployee()); + userService.updateStatus(empUser); + employeeService.updateStatus(empUser.getEmployee()); } /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 1e938920..106a1032 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -274,7 +274,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户")); } empUser.setStatus(User.STATUS_DISABLE); - userService.updateStatus(empUser); + empUserService.updateStatus(empUser); return renderResult(Global.TRUE, text("停用用户''{0}''成功", empUser.getUserName())); } @@ -294,7 +294,7 @@ public class EmpUserController extends BaseController { return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); } empUser.setStatus(User.STATUS_NORMAL); - userService.updateStatus(empUser); + empUserService.updateStatus(empUser); AuthorizingRealm.isValidCodeLogin(empUser.getLoginCode(), empUser.getCorpCode_(), null, "success"); return renderResult(Global.TRUE, text("启用用户''{0}''成功", empUser.getUserName())); }