Commit dfe007d3 authored by 王亮's avatar 王亮

fix an issue.

parent f356f22d
...@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.service.user.impl; ...@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.service.user.impl;
import cn.quantgroup.xyqb.Constants; import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.aspect.lock.RedisLock; import cn.quantgroup.xyqb.aspect.lock.RedisLock;
import cn.quantgroup.xyqb.config.data.ContractTemplateConfiguration; import cn.quantgroup.xyqb.config.data.ContractTemplateConfiguration;
import cn.quantgroup.xyqb.constant.UserConstant;
import cn.quantgroup.xyqb.constant.enums.LoginType; import cn.quantgroup.xyqb.constant.enums.LoginType;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.controller.internal.user.resp.UserFullResp; import cn.quantgroup.xyqb.controller.internal.user.resp.UserFullResp;
...@@ -32,7 +33,6 @@ import cn.quantgroup.xyqb.util.ValidationUtil; ...@@ -32,7 +33,6 @@ import cn.quantgroup.xyqb.util.ValidationUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sensorsdata.analytics.javasdk.ISensorsAnalytics; import com.sensorsdata.analytics.javasdk.ISensorsAnalytics;
...@@ -168,6 +168,9 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -168,6 +168,9 @@ public class UserServiceImpl implements IUserService, IBaseController {
@Override @Override
@CacheEvict(value = "usercache", key = "'xyqbuser' + #user.phoneNo", cacheManager = "cacheManager") @CacheEvict(value = "usercache", key = "'xyqbuser' + #user.phoneNo", cacheManager = "cacheManager")
public User saveUser(User user) { public User saveUser(User user) {
if (user.getTenantId() == null) {
user.setTenantId(UserConstant.defaultTenantId);
}
user = userRepository.saveAndFlush(user); user = userRepository.saveAndFlush(user);
//每次新增用户的时候,需要同步增长user_tag表 //每次新增用户的时候,需要同步增长user_tag表
applicationEventPublisher.publishEvent(new UserLoginEvent(this, UserTag.builder() applicationEventPublisher.publishEvent(new UserLoginEvent(this, UserTag.builder()
...@@ -558,13 +561,13 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -558,13 +561,13 @@ public class UserServiceImpl implements IUserService, IBaseController {
if (Objects.nonNull(loginFrom) && Objects.equals(user.getRegisteredFrom(), loginFrom)) { if (Objects.nonNull(loginFrom) && Objects.equals(user.getRegisteredFrom(), loginFrom)) {
return; return;
} }
List<Long> templates = contractTemplateConfiguration.getByTenantIdAndRegisteredFrom(tenantId,loginFrom); List<Long> templates = contractTemplateConfiguration.getByTenantIdAndRegisteredFrom(tenantId, loginFrom);
if(CollectionUtils.isEmpty(templates)){ if (CollectionUtils.isEmpty(templates)) {
return; return;
} }
templates.forEach(templateId->{ templates.forEach(templateId -> {
ContractRecordReq contractRecordReq = new ContractRecordReq(); ContractRecordReq contractRecordReq = new ContractRecordReq();
contractRecordReq.setTemplateId(templateId); contractRecordReq.setTemplateId(templateId);
contractRecordReq.setUserId(user.getId()); contractRecordReq.setUserId(user.getId());
......
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