From 6a76e1e6b05cb8cb8dd19299f23d1b825adf4abd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 六月 2024 17:34:09 +0800
Subject: [PATCH] 提交一把

---
 server/company/src/main/java/com/doumee/api/business/MemberController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index 74eea2e..cceaae3 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -96,7 +96,7 @@
     @GetMapping("/{id}")
     @RequiresPermissions("business:member:query")
     public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(memberService.findById(id));
+        return ApiResponse.success(memberService.findDetailById(id));
     }
 
 
@@ -112,14 +112,17 @@
     }
 
 
+
+
+
     @ApiOperation(value = "浜哄憳淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
     @PostMapping("/importExcel")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
     })
     @RequiresPermissions("business:worktype:create")
-    public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file) {
-        return ApiResponse.success(memberService.importBatch(file));
+    public ApiResponse<List<MemberImport>> importExcel (@ApiParam(value = "file") MultipartFile file,Integer  solutionId) {
+        return ApiResponse.success(memberService.importBatch(file,solutionId));
     }
 
 }

--
Gitblit v1.9.3