|
|
@@ -2902,33 +2902,34 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int updateUserDate(String uid,Integer province, Integer city, Integer area, String businessScope, String intendedProject,
|
|
|
- String introduction,Integer channelType,String orgCode) {
|
|
|
+ public int updateUserDate(InputUserData in ) {
|
|
|
OrganizationIdentity oi =new OrganizationIdentity();
|
|
|
- oi.setUid(uid);
|
|
|
- if (province!=null ||city !=null ||area!=null|| businessScope!=null ||intendedProject!=null||orgCode!=null){
|
|
|
- if(province!=null)oi.setLocationProvince(province);
|
|
|
- if(city!=null)oi.setLocationCity(city);
|
|
|
- if(area!=null)oi.setLocationArea(area);
|
|
|
- if (orgCode!=null)oi.setOrgCode(orgCode);
|
|
|
- if (businessScope!=null){
|
|
|
- OrganizationIdentity use=organizationIdentityMapper.selectOrgIdentityByUserId(uid);
|
|
|
- updateBusinessScope(uid,businessScope,use.getBusinessScope(),new Date());
|
|
|
- oi.setBusinessScope(businessScope);
|
|
|
+ oi.setUid(in.getUid());
|
|
|
+ if (in.getProvince()!=null ||in.getCity() !=null ||in.getArea()!=null|| in.getBusinessScope()!=null
|
|
|
+ ||in.getIntendedProject()!=null||in.getOrgCode()!=null||in.getIndustry()!=null){
|
|
|
+ if(in.getProvince()!=null)oi.setLocationProvince(in.getProvince());
|
|
|
+ if(in.getCity()!=null)oi.setLocationCity(in.getCity());
|
|
|
+ if(in.getArea()!=null)oi.setLocationArea(in.getArea());
|
|
|
+ if (in.getOrgCode()!=null)oi.setOrgCode(in.getOrgCode());
|
|
|
+ if (in.getIndustry()!=null)oi.setIndustry(in.getIndustry());
|
|
|
+ if (in.getBusinessScope()!=null){
|
|
|
+ OrganizationIdentity use=organizationIdentityMapper.selectOrgIdentityByUserId(in.getUid());
|
|
|
+ updateBusinessScope(in.getUid(),in.getBusinessScope(),use.getBusinessScope(),new Date());
|
|
|
+ oi.setBusinessScope(in.getBusinessScope());
|
|
|
}
|
|
|
- if(intendedProject!=null)oi.setIntendedProject(intendedProject);
|
|
|
+ if(in.getIntendedProject()!=null)oi.setIntendedProject(in.getIntendedProject());
|
|
|
organizationIdentityMapper.updateServiceByUid(oi);
|
|
|
}
|
|
|
- if (introduction!=null){
|
|
|
+ if (in.getIntroduction()!=null){
|
|
|
User user=new User();
|
|
|
- user.setId(uid);
|
|
|
- user.setIntroduction(introduction);
|
|
|
+ user.setId(in.getUid());
|
|
|
+ user.setIntroduction(in.getIntroduction());
|
|
|
userMapper.updateByPrimaryKeySelective(user);
|
|
|
}
|
|
|
- if (channelType !=null){
|
|
|
+ if (in.getChannelType() !=null){
|
|
|
UserMid um =new UserMid();
|
|
|
- um.setUid(uid);
|
|
|
- um.setChannelType(channelType);
|
|
|
+ um.setUid(in.getUid());
|
|
|
+ um.setChannelType(in.getChannelType());
|
|
|
userMidMapper.updateByUid(um);
|
|
|
}
|
|
|
return 1;
|
|
|
@@ -3208,13 +3209,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
params.put("count",publicReleases.size());
|
|
|
params.put("minPublicRelease",minPr);
|
|
|
params.put("maxPublicRelease",maxPr);
|
|
|
+ Map<String, Object> map = new LinkedHashMap<>();
|
|
|
latestFollow.ifPresent(userFollow -> {
|
|
|
- Map<String, Object> map = new LinkedHashMap<>();
|
|
|
map.put("id",userFollow.getId());
|
|
|
map.put("followTime",DateUtils.formatDate(userFollow.getCreateTime(),AFTConstants.YYYYMMDD));
|
|
|
map.put("followName",userFollow.getFollowName());
|
|
|
- params.put("latestFollow",map);
|
|
|
});
|
|
|
+ params.put("latestFollow",map);
|
|
|
return params;
|
|
|
}
|
|
|
|