From 1a371dc003e2b5f5246974240e021df695dfdfdc Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Fri, 27 Jul 2018 18:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/ISysUserService.java      |  3 +++
 .../sys/service/impl/SysUserServiceImpl.java      | 10 ++++++++++
 .../tamguo/modules/sys/web/SysUserController.java | 15 +++++++++++++--
 .../main/resources/mappers/sys/SysUserMapper.xml  |  2 +-
 .../templates/modules/sys/user/list.html          |  2 +-
 5 files changed, 28 insertions(+), 4 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 77ac19b..7df970f 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
@@ -45,4 +45,7 @@ public interface ISysUserService extends IService<SysUserEntity>{
 
 	/** 激活账号*/
 	public Result enable(String userCode);
+
+	/** 删除用户*/
+	public Result delete(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 c58e95e..2b9bb12 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
@@ -215,6 +215,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 		return Result.result(0, null, "停用成功！");
 	}
 
+	@Transactional(readOnly=false)
 	@Override
 	public Result enable(String userCode) {
 		SysUserEntity user = sysUserMapper.selectById(userCode);
@@ -223,4 +224,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 		return Result.result(0, null, "激活成功！");
 	}
 
+	@Transactional(readOnly=false)
+	@Override
+	public Result delete(String userCode) {
+		SysUserEntity user = sysUserMapper.selectById(userCode);
+		user.setStatus(SysUserStatusEnum.DELETE);
+		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 4e3f77b..dc873e9 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
@@ -153,7 +153,7 @@ public class SysUserController {
 		try {
 			return iSysUserService.disable(userCode);
 		} catch (Exception e) {
-			ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
+			ExceptionSupport.resolverResult("停用用户", this.getClass(), e);
 			return null;
 		}
 	}
@@ -164,7 +164,18 @@ public class SysUserController {
 		try {
 			return iSysUserService.enable(userCode);
 		} catch (Exception e) {
-			ExceptionSupport.resolverResult("保存数据权限", this.getClass(), e);
+			ExceptionSupport.resolverResult("激活用户", this.getClass(), e);
+			return null;
+		}
+	}
+	
+	@RequestMapping(path="delete",method=RequestMethod.POST)
+	@ResponseBody
+	public Result delete(String userCode) {
+		try {
+			return iSysUserService.delete(userCode);
+		} catch (Exception e) {
+			ExceptionSupport.resolverResult("删除用户", this.getClass(), e);
 			return null;
 		}
 	}
diff --git a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
index 6f27f83..383a8fc 100644
--- a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
+++ b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
@@ -22,7 +22,7 @@
 			sys_user u
 		LEFT JOIN sys_user_post up ON u.user_code = up.user_code
 		WHERE
-			1 = 1
+			1 = 1 and u.status != 1
 		<if test="loginCode != null and loginCode != ''">
 			and u.login_code = #{loginCode}
 		</if>
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 faaf2bc..d0b9d97 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
@@ -327,7 +327,7 @@ $('#dataGrid').dataGrid({
 				if (row.status == Global.STATUS_DISABLE){
 					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="'+ctx+'sys/user/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;');
 				actions.push('<div class="moreItems">');
 					actions.push('<a href="sys/user/role?userCode='+row.userCode+'&op=auth" class="btn btn-default btn-xs btnList" title="用户分配角色"><i class="fa fa-check-square-o"></i> 分配角色</a>&nbsp;');