From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 93eecb0..e2f8fa6 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -1,6 +1,7 @@
 package com.doumee.api.business;
 
 import com.doumee.api.BaseController;
+import com.doumee.config.DataSyncConfig;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
@@ -11,7 +12,9 @@
 import com.doumee.dao.admin.request.MemberQuery;
 import com.doumee.dao.admin.response.MemberInfoDTO;
 import com.doumee.dao.business.model.Member;
+import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.MemberService;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -30,6 +33,12 @@
 @RestController
 @RequestMapping("/business/member")
 public class MemberController extends BaseController {
+    @Autowired
+    private ERPSyncService erpSyncService;
+    @Autowired
+    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
+    @Autowired
+    private DataSyncConfig dataSyncConfig;
 
     @Autowired
     private MemberService memberService;
@@ -71,6 +80,33 @@
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鍛樺伐鏉冮檺涓嬪彂")
+    @GetMapping("/roleAuth/{id}")
+    @RequiresPermissions("business:empower:create")
+    public ApiResponse roleAuthById(@PathVariable Integer id) {
+        memberService.roleAuthById(id);
+        return ApiResponse.success(null);
+    }
+
+
+    @ApiOperation("鍚屾浜鸿劯淇℃伅")
+    @PostMapping("/updateFace")
+    public ApiResponse updateFace(@RequestBody Member member) {
+        memberService.updateFace(member);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("寮哄埗鍒犻櫎瀹夐槻骞冲彴浜哄憳淇℃伅")
+    @PostMapping("/delHkForce")
+    public ApiResponse delHkForce(@RequestBody Member member) {
+        memberService.delHkForce(member);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("閲嶆柊涓嬪彂浜鸿劯")
+    @PostMapping("/empowerByList")
+    public ApiResponse empowerByList(@RequestBody Member member) {
+        memberService.empowerByList(member);
+        return ApiResponse.success(null);
+    }
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @RequiresPermissions("business:member:update")
@@ -78,6 +114,7 @@
         memberService.updateById(member);
         return ApiResponse.success(null);
     }
+
 
     @ApiOperation("鏍规嵁ID 绂佸惎鐢�  ")
     @PostMapping("/updateStatusById")
@@ -174,6 +211,8 @@
     }
 
 
+
+
     /**
      *
      * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
@@ -215,4 +254,25 @@
         return ApiResponse.success(memberService.findList(member));
     }
 
+    @ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
+    @PostMapping("/syncAll")
+    @RequiresPermissions("business:member:sync")
+    public ApiResponse sync(){
+        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
+            erpSyncService.syncUsers(null);
+        }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
+            hkSyncOrgUserFHKService.syncUserData();
+        }
+        return ApiResponse.success("鍚屾鎴愬姛");
+    }
+
+
+
+    @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
+    @PostMapping("/testFreeFz")
+    public ApiResponse testFreeFz() {
+        memberService.memberFreeze();
+        return ApiResponse.success(null);
+    }
+
 }

--
Gitblit v1.9.3