From 4f4bbac861984a9dcf593f5549a141df26d86b1d Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 23 Dec 2023 23:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=86=BB=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/web/user/EmpUserController.java    | 14 ++++++++------
 .../views/modules/sys/user/empUserList.html        | 13 ++++++++++---
 2 files changed, 18 insertions(+), 9 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 f36d0649..e5d8f7da 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
@@ -269,19 +269,20 @@ public class EmpUserController extends BaseController {
 	@RequiresPermissions("sys:empUser:updateStatus")
 	@ResponseBody
 	@RequestMapping(value = "disable")
-	public String disable(EmpUser empUser) {
+	public String disable(EmpUser empUser, boolean freeze) {
 		if (User.isSuperAdmin(empUser.getUserCode())) {
 			return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
 		}
 		if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){
 			return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
 		}
+		String text = freeze ? "冻结" : "停用";
 		if (empUser.currentUser().getUserCode().equals(empUser.getUserCode())) {
-			return renderResult(Global.FALSE, text("停用用户失败，不允许停用当前用户"));
+			return renderResult(Global.FALSE, text(text + "用户失败，不允许" + text + "当前用户"));
 		}
-		empUser.setStatus(User.STATUS_DISABLE);
+		empUser.setStatus(freeze ? User.STATUS_FREEZE : User.STATUS_DISABLE);
 		empUserService.updateStatus(empUser);
-		return renderResult(Global.TRUE, text("停用用户''{0}''成功", empUser.getUserName()));
+		return renderResult(Global.TRUE, text(text + "用户''{0}''成功", empUser.getUserName()));
 	}
 	
 	/**
@@ -292,17 +293,18 @@ public class EmpUserController extends BaseController {
 	@RequiresPermissions("sys:empUser:updateStatus")
 	@ResponseBody
 	@RequestMapping(value = "enable")
-	public String enable(EmpUser empUser) {
+	public String enable(EmpUser empUser, boolean freeze) {
 		if (User.isSuperAdmin(empUser.getUserCode())) {
 			return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
 		}
 		if (!EmpUser.USER_TYPE_EMPLOYEE.equals(empUser.getUserType())){
 			return renderResult(Global.FALSE, "非法操作，不能够操作此用户！");
 		}
+		String text = freeze ? "解冻" : "启用";
 		empUser.setStatus(User.STATUS_NORMAL);
 		empUserService.updateStatus(empUser);
 		AuthorizingRealm.isValidCodeLogin(empUser.getLoginCode(), empUser.getCorpCode_(), null, "success");
-		return renderResult(Global.TRUE, text("启用用户''{0}''成功", empUser.getUserName()));
+		return renderResult(Global.TRUE, text(text + "用户''{0}''成功", empUser.getUserName()));
 	}
 	
 	/**
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 82c914bb..f567464e 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -147,8 +147,10 @@ $('#dataGrid').dataGrid({
 			//# if(hasPermi('sys:empUser:updateStatus')){
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="${ctx}/sys/empUser/disable?userCode='+row.userCode+'" class="btnList" title="${text("停用用户")}" data-confirm="${text("确认要停用该用户吗？")}"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
-				}else if (row.status == Global.STATUS_DISABLE || row.status == Global.STATUS_FREEZE || row.status == Global.STATUS_AUDIT){
+				}else if (row.status == Global.STATUS_DISABLE || row.status == Global.STATUS_AUDIT){
 					actions.push('<a href="${ctx}/sys/empUser/enable?userCode='+row.userCode+'" class="btnList" title="${text("启用用户")}" data-confirm="${text("确认要启用该用户吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}else if (row.status == Global.STATUS_FREEZE){
+					actions.push('<a href="${ctx}/sys/empUser/enable?userCode='+row.userCode+'&freeze=true" class="btnList" title="${text("解冻用户")}" data-confirm="${text("确认要解冻该用户吗？")}"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 			//# }
 			//# if(hasPermi('sys:empUser:edit')){
@@ -164,7 +166,12 @@ $('#dataGrid').dataGrid({
 					actions.push('<a href="${ctx}/sys/empUser/formAuthDataScope?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户分配数据权限")}"><i class="fa fa-check-circle-o"></i> ${text("数据权限")}</a>&nbsp;');
 				//# }
 				//# if(hasPermi('sys:empUser:resetpwd')){
-					actions.push('<a href="${ctx}/sys/empUser/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户密码重置")}" data-confirm="${text("确认要将该用户密码重置到初始状态吗？")}"><i class="fa fa-reply-all"></i> ${text("重置密码")}</a>&nbsp;');
+					actions.push('<a href="${ctx}/sys/empUser/resetpwd?userCode='+row.userCode+'" class="btn btn-default btn-xs btnList" title="${text("用户密码重置")}" data-confirm="${text("确认要将该用户密码重置到初始状态吗？")}"><i class="fa fa-key"></i> ${text("重置密码")}</a>&nbsp;');
+				//# }
+				//# if(hasPermi('sys:empUser:updateStatus')){
+				// 	if (row.status == Global.STATUS_NORMAL){
+				// 		actions.push('<a href="${ctx}/sys/empUser/disable?userCode='+row.userCode+'&freeze=true" class="btn btn-default btn-xs btnList" title="${text("冻结用户")}" data-confirm="${text("确认要冻结该用户吗？")}"><i class="glyphicon glyphicon-ban-circle"></i> ${text("冻结用户")}</a>&nbsp;');
+				// 	}
 				//# }
 				actions.push('</div>');
 			//# }
@@ -174,7 +181,7 @@ $('#dataGrid').dataGrid({
 	frozenCols: true,
 	//# // 加载成功后执行事件
 	ajaxSuccess: function(data){
-		
+
 	}
 });
 $('#btnExport').click(function(){