From f55f6e05bae945d275101592782fb3b8980d77cf Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Sun, 28 Jun 2020 15:26:47 +0800
Subject: [PATCH] update风速风向显示设置
---
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index ebc367d..81ebdcf 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -6,7 +6,7 @@
import javax.annotation.Resource;
-import com.moral.common.util.MyBatisBaseMapUtil;
+import com.moral.common.util.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -15,9 +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.ResourceUtil;
-import com.moral.common.util.ValidateUtil;
import com.moral.entity.OperateUser;
import com.moral.mapper.OperateUserMapper;
import com.moral.service.OperateUserService;
@@ -89,7 +86,9 @@
if (parameters.containsKey("sorter")) {
example.setOrderByClause((String) parameters.get("sorter"));
}
- criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE);
+ 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);
@@ -104,6 +103,10 @@
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);
}
}
@@ -132,7 +135,7 @@
}
@Override
- public Integer updateOperateUserCode(OperateUser operateUser) {
+ public Integer updateOperateUser(OperateUser operateUser) {
return operateUserMapper.updateByPrimaryKeySelective(operateUser);
}
}
--
Gitblit v1.8.0