|
|
@@ -52,6 +52,9 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
private DistrictGlossoryMapper districtGlossoryMapper;
|
|
|
@Resource
|
|
|
private UserInterviewProjectMapper userInterviewProjectMapper;
|
|
|
+ @Resource
|
|
|
+ private IndustryCategoryMapper industryCategoryMapper;
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -84,7 +87,6 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
}
|
|
|
UserArchivesDetails user = customerService.selectUserByUid(id);
|
|
|
User u = userMapper.queryById(id);
|
|
|
-
|
|
|
OrganizationIdentity ori = organizationIdentityMapper.selectOrgIdentityByUserId(id);
|
|
|
pushProvincePlus(ori, user);
|
|
|
|
|
|
@@ -142,6 +144,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
user.setLocationProvince(ori.getLocationProvince());
|
|
|
user.setLocationCity(ori.getLocationCity());
|
|
|
user.setLocationArea(ori.getLocationArea());
|
|
|
+// user.setIndustryName(ori.getin());
|
|
|
List<DistrictGlossory> all = districtGlossoryMapper.getAll();
|
|
|
if (ori.getLocationProvince()!=null){
|
|
|
all.stream().filter(e -> e.getLevel()==1).collect(Collectors.toList()).forEach(e -> {
|