|
|
@@ -51,9 +51,7 @@ import org.springframework.util.Assert;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -94,9 +92,13 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
|
|
|
@Autowired
|
|
|
private OrganizationUserServiceImpl organizationUserService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private CommonService commonService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserAboutInfoService userAboutInfoService;
|
|
|
+
|
|
|
/**
|
|
|
* 注册基本用户 (没有就注册,有就修改)
|
|
|
*
|
|
|
@@ -168,15 +170,10 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
|
|
|
realName = param.getName();
|
|
|
}
|
|
|
userAccount.setRealName(realName);
|
|
|
+ userAccount.setSpellCode(CommonUtil.getPinyin(param.getName()));
|
|
|
userCountDao.save(userAccount);
|
|
|
|
|
|
- // 更新关联的
|
|
|
- Map<String, Object> where = new HashMap<>();
|
|
|
- where.put("userId", userAccount.getUserId());
|
|
|
-
|
|
|
- Map<String, Object> standardData = new HashMap<>();
|
|
|
- standardData.put("name", userAccount.getName());
|
|
|
- commonService.updateData(where, standardData, OrganizationUser.class.getSimpleName());
|
|
|
+ userAboutInfoService.updateUserAboutEntityInfo(userAccount);
|
|
|
}
|
|
|
return ResultContent.buildSuccess(userAccount.getUserId());
|
|
|
}
|