From 8013c7ee3a8d7b284ced6bb9de1864792eb21daa Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Fri, 27 Jul 2018 16:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/ISysUserService.java  |  7 ++++++
 .../sys/service/impl/SysUserServiceImpl.java  | 18 +++++++++++++++
 .../modules/sys/web/SysUserController.java    | 23 +++++++++++++++++++
 .../templates/modules/sys/user/list.html      |  4 ++--
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
index e2272f5..77ac19b 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
@@ -8,6 +8,7 @@ import com.tamguo.modules.sys.model.SysUserDataScopeEntity;
 import com.tamguo.modules.sys.model.SysUserEntity;
 import com.tamguo.modules.sys.model.SysUserRoleEntity;
 import com.tamguo.modules.sys.model.condition.SysUserCondition;
+import com.tamguo.modules.sys.utils.Result;
 
 public interface ISysUserService extends IService<SysUserEntity>{
 	
@@ -38,4 +39,10 @@ public interface ISysUserService extends IService<SysUserEntity>{
 
 	/** 保存用户数据权限*/
 	public void saveUserDataScope(SysUserEntity user);
+
+	/** 停用账号*/
+	public Result disable(String userCode);
+
+	/** 激活账号*/
+	public Result enable(String userCode);
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
index fb6dcef..c58e95e 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
@@ -28,6 +28,7 @@ import com.tamguo.modules.sys.model.enums.SysUserStatusEnum;
 import com.tamguo.modules.sys.model.enums.SysUserTypeEnum;
 import com.tamguo.modules.sys.service.ISysRoleService;
 import com.tamguo.modules.sys.service.ISysUserService;
+import com.tamguo.modules.sys.utils.Result;
 import com.tamguo.modules.sys.utils.ShiroUtils;
 import com.tamguo.modules.sys.utils.TamguoConstant;
 
@@ -205,4 +206,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 		}
 	}
 
+	@Transactional(readOnly=false)
+	@Override
+	public Result disable(String userCode) {
+		SysUserEntity user = sysUserMapper.selectById(userCode);
+		user.setStatus(SysUserStatusEnum.DISABLED);
+		sysUserMapper.updateById(user);
+		return Result.result(0, null, "停用成功！");
+	}
+
+	@Override
+	public Result enable(String userCode) {
+		SysUserEntity user = sysUserMapper.selectById(userCode);
+		user.setStatus(SysUserStatusEnum.NORMAL);
+		sysUserMapper.updateById(user);
+		return Result.result(0, null, "激活成功！");
+	}
+
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
index 30c0671..4e3f77b 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysUserController.java
@@ -146,4 +146,27 @@ public class SysUserController {
 			return ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
 		}
 	}
+	
+	@RequestMapping(path="disable",method=RequestMethod.POST)
+	@ResponseBody
+	public Result disable(String userCode) {
+		try {
+			return iSysUserService.disable(userCode);
+		} catch (Exception e) {
+			ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
+			return null;
+		}
+	}
+	
+	@RequestMapping(path="enable",method=RequestMethod.POST)
+	@ResponseBody
+	public Result enable(String userCode) {
+		try {
+			return iSysUserService.enable(userCode);
+		} catch (Exception e) {
+			ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
+			return null;
+		}
+	}
+	
 }
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
index ddb7e8a..faaf2bc 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
@@ -322,10 +322,10 @@ $('#dataGrid').dataGrid({
 			var actions = [];
 				actions.push('<a href="sys/user/update?userCode='+row.userCode+'&op=edit" class="btnList" title="编辑用户"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
-					actions.push('<a href="/js/a/sys/empUser/disable?userCode='+row.userCode+'" class="btnList" title="停用用户" data-confirm="确认要停用该用户吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+					actions.push('<a href="'+ctx+'sys/user/disable?userCode='+row.userCode+'" class="btnList" title="停用用户" data-confirm="确认要停用该用户吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}
 				if (row.status == Global.STATUS_DISABLE){
-					actions.push('<a href="/js/a/sys/empUser/enable?userCode='+row.userCode+'" class="btnList" title="启用用户" data-confirm="确认要启用该用户吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+					actions.push('<a href="'+ctx+'sys/user/enable?userCode='+row.userCode+'" class="btnList" title="启用用户" data-confirm="确认要启用该用户吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
 				actions.push('<a href="/js/a/sys/empUser/delete?userCode='+row.userCode+'" class="btnList" title="删除用户" data-confirm="确认要删除该用户吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				actions.push('<a href="javascript:" class="btnMore" title="更多操作"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;');