From 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 八月 2024 17:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 7da2af5..31466bd 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -83,7 +83,7 @@
@GetMapping("/roleAuth/{id}")
@RequiresPermissions("business:empower:create")
public ApiResponse roleAuthById(@PathVariable Integer id) {
- memberService.roleAuthById(id);
+ memberService.roleAuthById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -231,7 +231,7 @@
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
erpSyncService.syncUsers(null);
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncUserData();
+ hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(null));
}
return ApiResponse.success("鍚屾鎴愬姛");
}
--
Gitblit v1.9.3