From aba833c7e94483639995f269aa00954e0bf4ade3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 18 Jan 2018 15:30:45 +0800
Subject: [PATCH] 设备管理

---
 src/main/java/com/moral/service/impl/OperateUserServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index f33c794..cbd00eb 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -15,6 +15,7 @@
 import com.moral.common.bean.PageBean;
 import com.moral.common.exception.BusinessException;
 import com.moral.common.util.Crypto;
+import com.moral.common.util.ResourceUtil;
 import com.moral.common.util.ValidateUtil;
 import com.moral.entity.OperateUser;
 import com.moral.mapper.OperateUserMapper;
@@ -82,6 +83,7 @@
 		if (parameters.containsKey("sorter")) {
 			example.setOrderByClause((String) parameters.get("sorter"));
 		}
+		criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
 		PageHelper.startPage(Integer.valueOf((String) parameters.get("pi")), Integer.valueOf((String) parameters.get("ps")));
 		List<OperateUser> operateUsers = operateUserMapper.selectByExample(example);
 		return new PageBean<OperateUser>(operateUsers);
@@ -93,6 +95,7 @@
 		if (ObjectUtils.isEmpty(operateUser.getId())) {
 			operateUser.setIsDelete(Constants.IS_DELETE_FALSE);
 			operateUser.setCreateTime(new Date());
+			operateUser.setPassword(Crypto.md5(ResourceUtil.getValue("password")));
 			return operateUserMapper.insertSelective(operateUser);
 		}else {
 			return operateUserMapper.updateByPrimaryKeySelective(operateUser);

--
Gitblit v1.8.0