diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
index 110ec9a8..402153e9 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/PartNameServiceImpl.java
@@ -97,6 +97,11 @@ public class PartNameServiceImpl extends ServiceImpl<PartNameMapper, PartName>
                 topLevelNodes.add(node);
             }
         }
+
+        // Set leafFlag for each node
+        for (PartName node : nodesCollection) {
+            node.setLeafFlag(node.getChildPartNameList() == null || node.getChildPartNameList().isEmpty());
+        }
         return topLevelNodes;
     }