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();