|
|
@@ -14,6 +14,7 @@ import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.util.encry.Md5Utils;
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
@Service("v2.UserService")
|
|
|
public class UserServiceImpl implements UserService {
|
|
|
@@ -40,8 +41,9 @@ public class UserServiceImpl implements UserService {
|
|
|
oldUser.setUserName(user.getVipName());
|
|
|
oldUser.setUserSex(user.getSex());
|
|
|
oldUser.setUserTel(user.getMobile());
|
|
|
+ oldUser.setUserIMId(StringUtils.isEmpty(user.getImId()) ? null : Long.valueOf(user.getImId()));
|
|
|
if (user.getPassword() != null) {
|
|
|
- if (user.getPassword().length() < 32) {// 传过来的是明文
|
|
|
+ if (user.getPassword().length() < 32) { // 传过来的是明文
|
|
|
oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), user.getUserUU()));
|
|
|
} else {
|
|
|
oldUser.setUserPwd(user.getPassword());// 传过来的是密文
|