From c0948102eda828d4eae62d18392adaca56e345e0 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 09 七月 2025 09:19:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java
index df102e8..2f31b53 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java
@@ -72,17 +72,17 @@
      */
     @GetMapping("/sync/wechatEnterprise/user/toLocal")
     public Result syncWechatEnterpriseUserToLocal(@RequestParam(value = "ids", required = false) String ids) {
-        return Result.error("鐢变簬浼佷笟寰俊鎺ュ彛璋冩暣锛屽悓姝ュ埌鏈湴鍔熻兘宸插け鏁�");
+        //return Result.error("鐢变簬浼佷笟寰俊鎺ュ彛璋冩暣锛屽悓姝ュ埌鏈湴鍔熻兘宸插け鏁�");
 
-//        if (thirdAppConfig.isWechatEnterpriseEnabled()) {
-//            SyncInfoVo syncInfo = wechatEnterpriseService.syncThirdAppUserToLocal();
-//            if (syncInfo.getFailInfo().size() == 0) {
-//                return Result.OK("鍚屾鎴愬姛", syncInfo);
-//            } else {
-//                return Result.error("鍚屾澶辫触", syncInfo);
-//            }
-//        }
-//        return Result.error("浼佷笟寰俊鍚屾鍔熻兘宸茬鐢�");
+        if (thirdAppConfig.isWechatEnterpriseEnabled()) {
+            SyncInfoVo syncInfo = wechatEnterpriseService.syncThirdAppUserToLocal();
+            if (syncInfo.getFailInfo().size() == 0) {
+                return Result.OK("鍚屾鎴愬姛", syncInfo);
+            } else {
+                return Result.error("鍚屾澶辫触", syncInfo);
+            }
+        }
+        return Result.error("浼佷笟寰俊鍚屾鍔熻兘宸茬鐢�");
     }
 
     /**

--
Gitblit v1.9.3