|
|
@@ -80,9 +80,7 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
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());
|
|
|
+
|
|
|
if (u.getAid().equals(TokenManager.getAdminId())){
|
|
|
user.setMyUser(1);
|
|
|
}else {
|
|
|
@@ -115,6 +113,9 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
}
|
|
|
|
|
|
private void pushProvincePlus(OrganizationIdentity ori, UserArchivesDetails user) {
|
|
|
+ user.setLocationProvince(ori.getLocationProvince());
|
|
|
+ user.setLocationCity(ori.getLocationCity());
|
|
|
+ user.setLocationArea(ori.getLocationArea());
|
|
|
List<DistrictGlossory> all = districtGlossoryMapper.getAll();
|
|
|
if (ori.getLocationProvince()!=null){
|
|
|
all.stream().filter(e -> e.getLevel()==1).collect(Collectors.toList()).forEach(e -> {
|