From 3d09e543befa0099649515484551d80d7e4eb87e Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 20 Apr 2026 16:25:14 +0800
Subject: [PATCH] commit

---
 .../budwk/app/base/event/role/RoleEventPublisher.java  | 10 ++++++++--
 .../impl/SysDataUserIncrUpdateServiceImpl.java         |  4 ++--
 .../com/budwk/app/task/job/SysUserAllRenewJob.java     |  7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

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..f015da3 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,5 +1,6 @@
 package com.budwk.app.base.event.role;
 
+import org.nutz.ioc.Ioc;
 import org.nutz.mvc.Mvcs;
 
 /**
@@ -12,9 +13,14 @@ import org.nutz.mvc.Mvcs;
 public class RoleEventPublisher {
 
     public static void broadcast(RoleEventMsg event){
-        String[] names = Mvcs.getIoc().getNamesByType(RoleEventListener.class);
+        Ioc ioc = Mvcs.getIoc();
+        if (ioc == null) {
+            return;
+        }
+
+        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/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java
index b9d3242..912d496 100644
--- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java
+++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java
@@ -73,10 +73,10 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
             cnd = ConditionGroupUtil.applyConditionGroup(cnd, updateParam.getConditionGroup());
         }
 
-        cnd.groupBy("loginname");
+//        cnd.groupBy("loginname");
 
         // 执行查询
-        List<Sys_user_source> userSources = dao.query(Sys_user_source.class, cnd);
+        List<Sys_user_source> userSources = dao.query(Sys_user_source.class, cnd.groupBy("loginname"));
 
         //加入到系统用户表
         List<Sys_user> sysUsers = BeanUtil.copyToList(userSources, Sys_user.class);
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..08b5aea 100644
--- a/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java
+++ b/src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java
@@ -11,6 +11,7 @@ import com.budwk.app.sys.services.SysDataUserUpdateService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
+import org.nutz.ioc.Ioc;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.json.Json;
@@ -34,7 +35,7 @@ public class SysUserAllRenewJob implements Job {
     @Inject
     private SysDataUserPullService sysDataUserPullService;
     @Inject
-    private SysDataUserUpdateService sysDataUserUpdateService;
+    private Ioc ioc;
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
@@ -57,6 +58,8 @@ public class SysUserAllRenewJob implements Job {
         param.setUpdateMode(SysDataUpdateMode.ALL.name());
         param.setConditionGroup(conditionGroup);
 
-         sysDataUserUpdateService.update(param);
+        SysDataUpdateMode updateMode = SysDataUpdateMode.ALL;
+        SysDataUserUpdateService sysDataUserUpdateService = (SysDataUserUpdateService) ioc.get(updateMode.getClazz());
+        sysDataUserUpdateService.update(param);
     }
 }