Merge branch 'refs/heads/b_lms' into master_merge

2024-07-02 16:27:15 +08:00
parent 7824298f1a 6a2a26e3c4
commit 8add85dd71
42 changed files with 434 additions and 257 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -495,7 +495,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                roleTree.add(row);
            }
            res.put("sonTree", roleTree);
-            result.put("rf_menu" + i, res);
+            result.put("rf_menu" + ("188".equals(res.getString("menu_id"))?1:0), res);
        }

        returnjo.put("code", "1");