فهرست منبع

fixed gitee ILOAI

hubin 6 سال پیش
والد
کامیت
793929a988

+ 3 - 15
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/MergeSegments.java

@@ -21,6 +21,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 
+import lombok.Getter;
+
 /**
  * <p>
  * 合并 SQL 片段
@@ -29,6 +31,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
  * @author miemie
  * @since 2018-06-27
  */
+@Getter
 @SuppressWarnings("serial")
 public class MergeSegments implements ISqlSegment {
 
@@ -64,19 +67,4 @@ public class MergeSegments implements ISqlSegment {
         }
     }
 
-    public NormalSegmentList getNormal() {
-        return normal;
-    }
-
-    public GroupBySegmentList getGroupBy() {
-        return groupBy;
-    }
-
-    public HavingSegmentList getHaving() {
-        return having;
-    }
-
-    public OrderBySegmentList getOrderBy() {
-        return orderBy;
-    }
 }

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/Page.java

@@ -165,7 +165,7 @@ public class Page<T> implements IPage<T> {
 
     public IPage<T> setAscs(List<String> ascs) {
         if (CollectionUtils.isNotEmpty(ascs)) {
-            this.ascs = (String[]) ascs.toArray();
+            this.ascs = ascs.toArray(new String[ascs.size()]);
         }
         return this;
     }
@@ -191,7 +191,7 @@ public class Page<T> implements IPage<T> {
 
     public IPage<T> setDescs(List<String> descs) {
         if (CollectionUtils.isNotEmpty(descs)) {
-            this.descs = (String[]) descs.toArray();
+            this.descs = descs.toArray(new String[descs.size()]);
         }
         return this;
     }