From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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..81ebdcf 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
+import com.moral.common.util.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -14,8 +15,6 @@
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
-import com.moral.common.util.Crypto;
-import com.moral.common.util.ValidateUtil;
import com.moral.entity.OperateUser;
import com.moral.mapper.OperateUserMapper;
import com.moral.service.OperateUserService;
@@ -25,10 +24,15 @@
@Service
public class OperateUserServiceImpl implements OperateUserService {
-
+ private static Class ENTITY_CLASS = OperateUser.class;
@Resource
private OperateUserMapper operateUserMapper;
-
+ @Override
+ public boolean isUniqueProperty(String propertyName, Object value){
+ Example example = new Example(ENTITY_CLASS);
+ example.or().andEqualTo(propertyName,value);
+ return operateUserMapper.selectCountByExample(example)==0;
+ }
@Override
public OperateUser getOperateUserByMobile(String mobile) {
OperateUser operateUser = new OperateUser();
@@ -82,6 +86,9 @@
if (parameters.containsKey("sorter")) {
example.setOrderByClause((String) parameters.get("sorter"));
}
+ Object isDelete = parameters.get("isDelete");
+ criteria.andEqualTo("isDelete",isDelete!=null?isDelete:0);
+// 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,8 +100,13 @@
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 {
+ if(!StringUtils.isNullOrEmpty(operateUser.getPassword())){
+ // ������������
+ operateUser.setPassword(Crypto.md5(operateUser.getPassword()));
+ }
return operateUserMapper.updateByPrimaryKeySelective(operateUser);
}
}
@@ -116,4 +128,14 @@
example.or().andIn("id", ids);
return operateUserMapper.updateByExampleSelective(operateUser, example);
}
+
+ @Override
+ public PageBean queryByPageBean(PageBean pageBean) {
+ return MyBatisBaseMapUtil.queryPage(operateUserMapper,pageBean,ENTITY_CLASS);
+ }
+
+ @Override
+ public Integer updateOperateUser(OperateUser operateUser) {
+ return operateUserMapper.updateByPrimaryKeySelective(operateUser);
+ }
}
--
Gitblit v1.8.0