Browse Source

更新企业档案与面谈接口修改

anderx 9 months ago
parent
commit
086d398a51

+ 0 - 1
src/main/java/com/goafanti/common/mapper/UserArchivesMapper.xml

@@ -248,7 +248,6 @@
     <select id="queryByUid" resultMap="UserArchivesMap">
         select
         <include refid="UserArchivesAllSql"/>
-
         from user_archives
         where uid = #{id}
     </select>

+ 4 - 3
src/main/java/com/goafanti/customer/service/impl/UserArchivesServiceImpl.java

@@ -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 -> {