diff --git a/jeelowcode-admin/src/main/resources/application.yaml b/jeelowcode-admin/src/main/resources/application.yaml index 07991f9..4e2fc76 100644 --- a/jeelowcode-admin/src/main/resources/application.yaml +++ b/jeelowcode-admin/src/main/resources/application.yaml @@ -382,6 +382,7 @@ jeelowcode: - /admin-api/infra/file/*/get/** # 获取图片,和租户无关 - /admin-api/system/sms/callback/* # 短信回调接口,无法带上租户编号 - /admin-api/jeelowcode/** # 低代码平台的全部放开,有自己的一套租户 规则 + - /admin-api/system/user-sync ignore-tables: - DUAL - dual diff --git a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/UserSyncServiceImpl.java b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/UserSyncServiceImpl.java index d332f03..1f50518 100644 --- a/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/UserSyncServiceImpl.java +++ b/jeelowcode-service/jeelowcode-service-system-biz/src/main/java/com/jeelowcode/service/system/service/impl/UserSyncServiceImpl.java @@ -21,10 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -114,7 +111,11 @@ public class UserSyncServiceImpl implements IUserSyncService { } } }).collect(Collectors.toList()); - return MasterRespResult.buildSuccess(mdMappings); + // 3.返回结果 + return mdMappings.stream() + .filter(MasterUserResultVO::getSuccess).findAny() + .map(masterUserResult -> MasterRespResult.buildSuccess(mdMappings)) + .orElseGet(() -> MasterRespResult.buildFail(mdMappings)); }