|
|
@@ -47,6 +47,8 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
private UserFirstInterviewMapper userFirstInterviewMapper;
|
|
|
@Resource
|
|
|
private OrganizationIdentityMapper organizationIdentityMapper;
|
|
|
+ @Resource
|
|
|
+ private DistrictGlossoryMapper districtGlossoryMapper;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -75,6 +77,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
UserArchivesDetails user = customerService.selectUserByUid(id);
|
|
|
User u = userMapper.queryById(id);
|
|
|
OrganizationIdentity ori = organizationIdentityMapper.selectOrgIdentityByUserId(id);
|
|
|
+ pushProvincePlus(ori, user);
|
|
|
user.setLocationProvince(ori.getLocationProvince());
|
|
|
user.setLocationCity(ori.getLocationCity());
|
|
|
user.setLocationArea(ori.getLocationArea());
|
|
|
@@ -107,6 +110,31 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
return user;
|
|
|
}
|
|
|
|
|
|
+ private void pushProvincePlus(OrganizationIdentity ori, UserArchivesDetails user) {
|
|
|
+ List<DistrictGlossory> all = districtGlossoryMapper.getAll();
|
|
|
+ if (ori.getLocationProvince()!=null){
|
|
|
+ all.stream().filter(e -> e.getLevel()==1).collect(Collectors.toList()).forEach(e -> {
|
|
|
+ if (ori.getLocationProvince().equals(e.getId())){
|
|
|
+ user.setLocationProvinceName(e.getName());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (ori.getLocationCity()!=null){
|
|
|
+ all.stream().filter(e -> e.getLevel()==2).collect(Collectors.toList()).forEach(e -> {
|
|
|
+ if (ori.getLocationCity().equals(e.getId())){
|
|
|
+ user.setLocationCityName(e.getName());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (ori.getLocationArea()!=null){
|
|
|
+ all.stream().filter(e -> e.getLevel()==3).collect(Collectors.toList()).forEach(e -> {
|
|
|
+ if (ori.getLocationArea().equals(e.getId())){
|
|
|
+ user.setLocationAreaName(e.getName());
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public boolean checkPermission(String id) {
|
|
|
User user = userMapper.queryById(id);
|