Forráskód Böngészése

fix: 去掉大区经理兼任 区域协调人选择报错

caozixuan 1 éve
szülő
commit
0be4af5711

+ 12 - 7
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesServiceImpl.java

@@ -535,14 +535,19 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
                 }
                 TBCrm chooseCrm = temp.get(0);
                 Long coordinatorId = chooseCrm.getRegionCoordinatorId();
-                if (coordinatorId != null && !list.stream().map(ArchivesSourceResult::getUserId).collect(Collectors.toList()).contains(coordinatorId)) {
-                    TBUserArchives chooseArchives = tbUserArchivesService.findByUserId(coordinatorId);
-                    ArchivesSourceResult choose = new ArchivesSourceResult();
-                    choose.setArchivesId(chooseArchives.getId());
-                    choose.setUserId(coordinatorId);
-                    choose.setName(chooseArchives.getName());
-                    list.add(choose);
+                Long regionLeaderId = chooseCrm.getLeadId();
+                if (!Objects.equals(coordinatorId, regionLeaderId)){
+                    // 不是由大区经理兼任的再去查档案,否则会报错(不存在档案)
+                    if (coordinatorId != null && !list.stream().map(ArchivesSourceResult::getUserId).collect(Collectors.toList()).contains(coordinatorId)) {
+                        TBUserArchives chooseArchives = tbUserArchivesService.findByUserId(coordinatorId);
+                        ArchivesSourceResult choose = new ArchivesSourceResult();
+                        choose.setArchivesId(chooseArchives.getId());
+                        choose.setUserId(coordinatorId);
+                        choose.setName(chooseArchives.getName());
+                        list.add(choose);
+                    }
                 }
+
             }
             result = list;
         }