diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index 3a40609..97e0519 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -166,12 +166,12 @@ public class SysTaskCycleController extends CoreBaseController { for (SysRefTaskCyclePlan item : taskCyclePlans) { // 查找关联任务计划 sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(), item.getTaskPlanGroupName()); - ValidatorBean.checkNotNull(sysTaskPlan, "任务计划不存在," + - "组名称:【" + item.getTaskPlanGroupName() + "】,名称:【" + item.getTaskPlanName() + "】"); - // 查找任务 sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId()); - ValidatorBean.checkNotNull(sysTask, "任务不存在:【" + sysTaskPlan.getTaskNameRdd() + "】"); + + if(sysTaskPlan == null || sysTask == null){ + continue; + } sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName()); sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 2377a2a..d7e33fa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -164,7 +164,7 @@ public class SysDictionaryService implements ISysDictionaryService { DdlPackBean hqlPack = CoreHqlPack.packHqlSysDictionaryPage(sysDictionary); pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(), pager), pager); + return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack, pager), pager); } @Override