|
|
@@ -380,14 +380,36 @@ public class SecurityController {
|
|
|
// 企业判断
|
|
|
Enterprise enterprise = new Enterprise();
|
|
|
if (userAccount.getSpaceUU() != null) {
|
|
|
- enterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
|
|
|
+ Enterprise oldEnterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
|
|
|
// 判断商城是否存在当前企业，若存在则设置当前企业即可，若不存在则需新建一个企业后进行设置
|
|
|
- if (enterprise == null) {
|
|
|
+ if (oldEnterprise == null) {
|
|
|
// 从账户中心获取当前企业信息尽心保存
|
|
|
UserSpaceView userSpaceView = AccountUtils.findBySpaceUU(userAccount.getSpaceUU());
|
|
|
if (userSpaceView != null) {
|
|
|
- enterprise = enterpriseService.update(userSpaceView);
|
|
|
+ if (!StringUtils.isEmpty(userSpaceView.getAccessSecret())) {
|
|
|
+ enterprise.setAccessSecret(userSpaceView.getAccessSecret());
|
|
|
+ }
|
|
|
+ enterprise.setEnAddress(userSpaceView.getRegAddress());
|
|
|
+ enterprise.setEnCorporation(userSpaceView.getCorporation());
|
|
|
+ enterprise.setEnBussinessCode(userSpaceView.getBusinessCode());
|
|
|
+ String enTel = enterprise.getEnTel();
|
|
|
+ if (enTel == null) {
|
|
|
+ enterprise.setEnTel(userSpaceView.getTelephone());
|
|
|
+ if (userSpaceView.getTelephone() == null) {
|
|
|
+ enterprise.setEnTel(userSpaceView.getAdmin().getMobile());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ enterprise.setEnName(userSpaceView.getSpaceName());
|
|
|
+ enterprise.setEnLogoUrl(userSpaceView.getBusinessCodeImage());
|
|
|
+ enterprise.setUu(Long.valueOf(userSpaceView.getSpaceUU()));
|
|
|
+ if (userSpaceView.getAdminUU() != null) {
|
|
|
+ enterprise.setEnAdminuu(userSpaceView.getAdminUU());
|
|
|
+ }
|
|
|
+ enterprise.setEnValidCode(userSpaceView.getValidCode());
|
|
|
+ enterprise = enterpriseDao.save(enterprise);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ enterprise = oldEnterprise;
|
|
|
}
|
|
|
}
|
|
|
// 没用用户
|
liusw