From ca66f2f175e6b66eda193ce58439515a9484e6b7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 03 Sep 2019 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 9 +++++----
1 files changed, 5 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 7fa8a29..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;
@@ -106,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);
}
}
--
Gitblit v1.8.0