diff --git a/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java b/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java index 59ae31a..8363e91 100644 --- a/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java +++ b/src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java @@ -1,6 +1,7 @@ package com.budwk.app.base.event.role; -import org.nutz.mvc.Mvcs; +import com.budwk.app.base.utils.AppIocUtil; +import org.nutz.ioc.Ioc; /** * @version 1.0 @@ -12,9 +13,10 @@ import org.nutz.mvc.Mvcs; public class RoleEventPublisher { public static void broadcast(RoleEventMsg event){ - String[] names = Mvcs.getIoc().getNamesByType(RoleEventListener.class); + Ioc ioc = AppIocUtil.get(); + String[] names = ioc.getNamesByType(RoleEventListener.class); for (String name : names) { - RoleEventListener listener = Mvcs.getIoc().get(RoleEventListener.class, name); + RoleEventListener listener = ioc.get(RoleEventListener.class, name); listener.receive(event); } } diff --git a/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java b/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java index 4ca0a98..058b873 100644 --- a/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java +++ b/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java @@ -43,6 +43,7 @@ public class SysUserAllRenewJob implements Job { NutMap conditionGroupMap = (NutMap)jobDataMap.get("conditionGroup"); if(conditionGroupMap == null || conditionGroupMap.isEmpty()){ log.error("SysUserAllRenewJob定时任务执行中止,原因:conditionGroup为null"); + return; } String conditionGroupStr = Json.toJson(conditionGroupMap).replace("@currentDate", DateUtil.today()); ConditionGroup conditionGroup = null;