Commit 5d5a81e1 authored by zhouqian's avatar zhouqian

null value

parent 307d1100
...@@ -92,12 +92,14 @@ public class InnerController { ...@@ -92,12 +92,14 @@ public class InnerController {
if (user == null) { if (user == null) {
user = new User(); user = new User();
} }
if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
user.setUuid(uuid);
}
user.setPhoneNo(phoneNo); user.setPhoneNo(phoneNo);
user.setCreatedAt(new Timestamp(createdAt)); user.setCreatedAt(new Timestamp(createdAt));
user.setUpdatedAt(new Timestamp(updatedAt)); user.setUpdatedAt(new Timestamp(updatedAt));
user.setEnable(true); user.setEnable(true);
user.setRegisteredFrom(registeredFrom); user.setRegisteredFrom(registeredFrom);
user.setUuid(uuid);
user.setPassword(password); user.setPassword(password);
user = userService.saveUser(user); user = userService.saveUser(user);
UserRet userRet = null; UserRet userRet = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment