Merge remote-tracking branch 'origin/master'

无关风月

2026-01-29 53cf557068952a2a5354311356342ba5e88919fe

 ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java

@@ -558,10 +558,10 @@
                            break;
                        }
                    }

                    if (!matchesRule) {
                        break;
                    }
                    //短路与开关
                    // if (!matchesRule) {
                    //     break;
                    // }
                }

                if (matchesRule) {