diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java index ee162976..dd053fa6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java @@ -79,13 +79,15 @@ public class CoreBaseService<T> extends CoreBaseAnnotationParser { * @param <T> * @param <R> */ - public <T, R extends Number> BigDecimal getAutoIncrement(T paras, Function<T, R> function) { + public <T, R extends Number> BigDecimal getFuncIncrement(T paras, Function<T, R> function) { List<T> templateList = sqlManager.template(paras); if (ObjectUtil.isEmpty(templateList)) { - return null; + return BigDecimal.ONE; } - Number v1 = ObjectUtil.defaultIfNull(function.apply(templateList.get(0)), 0); + T max = templateList.stream().max((o1, o2) -> NumberUtil.sub(function.apply(o1), function.apply(o2)).intValue()).get(); + + Number v1 = ObjectUtil.defaultIfNull(function.apply(max), 0); return NumberUtil.add(v1, 1); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java index 8effdae4..6e92c76a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentClientLinkService.java @@ -89,12 +89,12 @@ public class StudentClientLinkService extends CoreBaseService<StudentClientLink> public JsonResult add(StudentClientLinkQuery studentClientLinkQuery){ String msg = ""; StudentClientLink studentClientLink = studentClientLinkQuery.pojo(); - // 获取新的排序值 StudentClientLink paras = new StudentClientLink(); paras.setStudentClientLinkOpenType(studentClientLink.getStudentClientLinkOpenType()); + paras.setStudentClientLinkType(studentClientLink.getStudentClientLinkType()); paras.setStudentClientLinkStatus(1); - BigDecimal bigDecimal = getAutoIncrement(paras, StudentClientLink::getStudentClientLinkOrder); + BigDecimal bigDecimal = getFuncIncrement(paras, StudentClientLink::getStudentClientLinkOrder); studentClientLink.setStudentClientLinkOrder(bigDecimal.intValue()); studentClientLinkDao.insert(studentClientLink); diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java index ad35673e..4f8881d0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentClientLinkQuery.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.web.query; +import cn.hutool.core.util.ObjectUtil; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; @@ -121,9 +122,9 @@ public class StudentClientLinkQuery extends PageParam { pojo.setStudentClientLinkContent(this.getStudentClientLinkContent()); pojo.setStudentClientLinkType(this.getStudentClientLinkType()); pojo.setStudentClientLinkImg(this.getStudentClientLinkImg()); - pojo.setStudentClientLinkStatus(this.getStudentClientLinkStatus()); + pojo.setStudentClientLinkStatus(ObjectUtil.defaultIfNull(this.getStudentClientLinkStatus(), 1)); pojo.setStudentClientLinkOpenType(this.getStudentClientLinkOpenType()); - pojo.setCreateTime(this.getCreateTime()); + pojo.setCreateTime(ObjectUtil.defaultIfNull(this.getCreateTime(), new Date())); pojo.setUserId(this.getUserId()); pojo.setOrgId(this.getOrgId()); return pojo;