From 3539230d44ab8d36ed9dcbf0bb623137fd74006b Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 21 Sep 2020 13:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/user/EmpUserController.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 cc4d088a..0019309a 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 @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.subject.Subject; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -73,10 +74,7 @@ public class EmpUserController extends BaseController { @ModelAttribute public EmpUser get(String userCode, boolean isNewRecord) { - EmpUser empUser = new EmpUser(); - empUser.setUserCode(userCode); - empUser.setIsNewRecord(isNewRecord); - return empUserService.getAndValid(empUser); + return empUserService.get(userCode, isNewRecord); } @RequiresPermissions("sys:empUser:view") @@ -172,12 +170,11 @@ public class EmpUserController extends BaseController { if (!Global.TRUE.equals(checkEmpNo(old != null ? old.getEmployee().getEmpNo() : "", empUser.getEmployee().getEmpNo()))) { return renderResult(Global.FALSE, text("保存用户失败，员工工号''{0}''已存在", empUser.getEmployee().getEmpNo())); } - if (StringUtils.inString(op, Global.OP_ADD, Global.OP_EDIT) - && UserUtils.getSubject().isPermitted("sys:empUser:edit")){ + Subject subject = UserUtils.getSubject(); + if (StringUtils.inString(op, Global.OP_ADD, Global.OP_EDIT) && subject.isPermitted("sys:empUser:edit")){ empUserService.save(empUser); } - if (StringUtils.inString(op, Global.OP_ADD, Global.OP_AUTH) - && UserUtils.getSubject().isPermitted("sys:empUser:authRole")){ + if (StringUtils.inString(op, Global.OP_ADD, Global.OP_AUTH) && subject.isPermitted("sys:empUser:authRole")){ userService.saveAuth(empUser); } return renderResult(Global.TRUE, text("保存用户''{0}''成功", empUser.getUserName()));