1

src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -143,12 +143,7 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
         }
         List<JyUserPlatform> jyUserPlatforms = this.getBaseMapper().queryByKey(param.getQueryKey());
 
-        List<Integer> collect = jyUserPlatforms.stream().map(JyUserPlatform::getPlatformId).filter(Objects::nonNull).collect(Collectors.toList());
-        HashMap<Integer,JyPlatform> map = new HashMap<>();
-        if(!collect.isEmpty()){
-            List<JyPlatform> jyPlatforms = platformService.listByIds(collect);
-            jyPlatforms.forEach(e -> map.put(e.getId(),e));
-        }
+
         List<Long> sysUserIds = jyUserPlatforms.stream().map(JyUserPlatform::getSysUserId).collect(Collectors.toList());
         HashMap<Long,SysUser> sysUserMap = new HashMap<>();
         HashMap<Long, SysRole> roleMap = new HashMap<>();
@@ -167,7 +162,12 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
             BeanUtils.copyProperties(jyPlatformUserWait,jyUserPlatform);
             jyUserPlatforms.add(jyUserPlatform);
         }
-
+        List<Integer> collect = jyUserPlatforms.stream().map(JyUserPlatform::getPlatformId).filter(Objects::nonNull).collect(Collectors.toList());
+        HashMap<Integer,JyPlatform> map = new HashMap<>();
+        if(!collect.isEmpty()){
+            List<JyPlatform> jyPlatforms = platformService.listByIds(collect);
+            jyPlatforms.forEach(e -> map.put(e.getId(),e));
+        }
         for (JyUserPlatform jyUserPlatform : jyUserPlatforms) {
             if(jyUserPlatform.getPlatformId()!=null){
                 JyPlatform jyPlatform =map.get(jyUserPlatform.getPlatformId());