Ver Fonte

add:资源保障

caozixuan há 1 ano atrás
pai
commit
352a315ad4

+ 10 - 9
sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesServiceImpl.java

@@ -242,10 +242,9 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
         if (userId != null && userId > 0) {
             // 编辑
             sysUser = sysUserService.getById(userId);
-        } else {
-            sysUser.setLoginName(name);
-            sysUser.setRealName(name);
         }
+        sysUser.setLoginName(name);
+        sysUser.setRealName(name);
         sysUser.setMobileNumber(mobileNumber);
         sysUser.setGender(gender);
         sysUser.setRoleIds(roleIds);
@@ -454,12 +453,14 @@ public class TBUserArchivesServiceImpl extends ServiceImpl<TBUserArchivesMapper,
             }
             TBCrm chooseCrm = temp.get(0);
             Long coordinatorId = chooseCrm.getRegionCoordinatorId();
-            TBUserArchives chooseArchives = tbUserArchivesService.findByUserId(coordinatorId);
-            ArchivesSourceResult choose = new ArchivesSourceResult();
-            choose.setArchivesId(chooseArchives.getId());
-            choose.setUserId(coordinatorId);
-            choose.setName(chooseArchives.getName());
-            list.add(choose);
+            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);
+            }
         }
         return list;
     }