Forráskód Böngészése

feature: 同步功能完善
1.学员kafka获取不到租户bug修改

luo.yibo@datuai.com 1 éve
szülő
commit
a46bf19e95

+ 6 - 7
ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/util/TrainUtils.java

@@ -105,15 +105,14 @@ public class TrainUtils {
         person.setCategory(DefaultConstants.CATEGORY_TRAINEE);
         person.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
         person.setPostCode(DefaultConstants.TRAINEE_CODE);
-        if (ObjectUtil.isNotEmpty(stuObj.get("tenantId"))) {
+        if (ObjectUtil.isNotEmpty(data.get("tenantId"))) {
+            // 不处理没有租户Id的学员
             person.setTenantId(stuObj.get("tenantId").toString());
-        } else {
-            person.setTenantId(defaultConfig.getTenantId());
+            // 学员班级列表处理
+            List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(data);
+            person.setUserDeptList(resourcePersonDeptList);
+            resourcePersonList.add(person);
         }
-        // 学员班级列表处理
-        List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(data);
-        person.setUserDeptList(resourcePersonDeptList);
-        resourcePersonList.add(person);
 
         return resourcePersonList;
     }

+ 0 - 1
ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/local/BackStageEventStrategyImpl.java

@@ -40,7 +40,6 @@ public class BackStageEventStrategyImpl implements IYktEventStrategy {
     public void doMsgHandle(String eventType, Object msg) throws Exception {
         switch (eventType){
             case EventTypeConstants.ACCOUNT -> {
-                log.info("消息内容-{}", msg);
                 RemoteUserAccountBo remoteBo = JSONUtil.toBean(JSONUtil.parseObj(msg), RemoteUserAccountBo.class);
                 log.info("[处理云端->本地一卡通账户同步请求]-[账户信息:{}]", JSONUtil.toJsonStr(remoteBo));
                 RemoteUserAccountVo remoteVo = remoteAccountService.getUserAccountVoById(remoteBo.getUserId());