Sfoglia il codice sorgente

更新树型模型处理逻辑

woody 1 anno fa
parent
commit
d52b655b0c

+ 3 - 1
framework-database/src/main/java/com/chelvc/framework/database/interceptor/PropertyUpdateInterceptor.java

@@ -7,6 +7,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import com.chelvc.framework.base.function.Provider;
 import com.chelvc.framework.base.util.ObjectUtils;
@@ -194,7 +195,8 @@ public class PropertyUpdateInterceptor implements Interceptor {
         if (entity instanceof TreeEntity) {
             TreeEntity<?, ?> tree = (TreeEntity<?, ?>) entity;
             tree.setLevel(1);
-            tree.setSequence(EntityUtils.buildTreeSequence(tree.getId()));
+            Serializable id = Objects.requireNonNull(tree.getId(), "Identity unspecified");
+            tree.setSequence(EntityUtils.buildTreeSequence(id));
             if (tree.getParentId() != null) {
                 String sql = this.buildChildrenCreateSql(tree, boundSql);
                 metaObject.setValue("delegate.boundSql.sql", sql);

+ 2 - 2
framework-database/src/main/java/com/chelvc/framework/database/util/EntityUtils.java

@@ -127,8 +127,8 @@ public final class EntityUtils {
      * @param id 树形数据主键
      * @return 序列号
      */
-    public static String buildTreeSequence(Serializable id) {
-        return Objects.requireNonNull(id) + StringUtils.HORIZONTAL;
+    public static String buildTreeSequence(@NonNull Serializable id) {
+        return id + StringUtils.HORIZONTAL;
     }
 
     /**