From 4fd760c5038b88981828bb5921fc7b0a835ffff1 Mon Sep 17 00:00:00 2001 From: jiajia Date: Tue, 4 Jun 2024 15:02:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:bug=E5=AF=BC=E5=87=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E6=B2=A1=E6=9C=89=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AE=B0=E5=BD=95=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/SysPojoVersionService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java index 4e6748d..ef84223 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; @@ -69,6 +70,7 @@ public class SysPojoVersionService extends CrudService implement String userName = model.getUserName(); Long roleId = model.getRoleId(); DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPackBean packBeanPlan = DdlPackBean.getDdlPackBean(); if (Strings.isNotBlank(userName)){ DdlPreparedPack.getStringEqualPack(userName, "modifyUser", packBean); } @@ -83,7 +85,10 @@ public class SysPojoVersionService extends CrudService implement DdlPreparedPack.timeBuilder(startDate, endDate, "modifyDatetime", true, false, packBean); List pojoVersions = pojoVersionRDao.findByHqlWhere(packBean); - List pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",packBeanPlan); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",packBeanPlan); + List pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBeanPlan); + pojoVersions.stream().parallel().forEach(d -> { Optional plan = pojoVersionPlans.stream().filter(p -> d.getPlanId().equals(p.getId())).findFirst();