Merge remote-tracking branch 'origin/master'

06a78601 · 赵啸非 · ef3b6b77 · 9b3bfd33 · 06a78601
Commit 06a78601 authored Jan 02, 2025 by 赵啸非
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java ...rtals/xhx/module/user/web/UserModelCollectController.java +3 -1

No files found.
--- a/portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserModelCollectController.java
@@ -97,8 +97,10 @@ public class UserModelCollectController extends BaseCRUDJsonBodyMappingControlle
                        }
                        List<ModelFeignVO> result = new ArrayList<>();
                        for(Long id:idList){
+                            if(map.containsKey(id)) {
                                result.add(map.get(id));
                            }
+                        }
                        model.put("data", result);
                    }catch (Exception e){
                        model.put("data", apiResp.getData().get("data"));