Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-23 687c9b21d0c8aedbd0c3f2d64b11cfaad5e38e85

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java

@@ -115,17 +115,14 @@
            item.setCreateBy(SecurityUtils.getUsername());
            item.setCreateTime(DateUtils.getNowDate());
        });
        Collections.reverse(list);
        list = list.stream()
                .filter(item -> {
                    item.setKey(null);
                    if (!keys.contains(item.getKey())) {
                        keys.add(item.getKey());
                        return true;
        for (int i = list.size() - 1; i >= 0; --i) {
            list.get(i).setKey(null);
            if (!keys.contains(list.get(i).getKey())) {
                keys.add(list.get(i).getKey());
            } else {
                list.remove(i);
                    }
                    return false;
                })
                .collect(Collectors.toList());
        }

        if (!list.isEmpty()) {
            Set<String> facCodeKey = apsMaterialProductGroupManagementMapper.selectByFacOrMaterial(keys);