From 12e8eb9e345adea19972c34df471b28b51fa71dd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 21 五月 2024 15:34:11 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 78dad97..69592d7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -3,6 +3,7 @@
 import com.doumee.api.BaseController;
 import com.doumee.config.DataSyncConfig;
 import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
@@ -12,6 +13,7 @@
 import com.doumee.dao.admin.request.LaborMemberDTO;
 import com.doumee.dao.admin.request.MemberImport;
 import com.doumee.dao.admin.request.MemberQuery;
+import com.doumee.dao.business.dto.ResetPasswordDTO;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.business.model.MemberRole;
 import com.doumee.service.business.MemberService;
@@ -105,7 +107,7 @@
         memberService.updateFace(member);
         return ApiResponse.success(null);
     }
-    @ApiOperation("鍚屾浜鸿劯淇℃伅")
+    @ApiOperation("鎵归噺鎺堟潈涓嬪彂")
     @PostMapping("/batchRoleAuth")
     public ApiResponse batchRoleAuth(@RequestBody Member memberRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         memberRole.setLoginUserInfo(this.getLoginUser(token));
@@ -163,10 +165,11 @@
     @PostMapping("/importExcel")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+            @ApiImplicitParam(name = "缁勭粐绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", value = "companyType", required = true, paramType = "query", dataType = "Integer",example = "0",dataTypeClass = Integer.class),
     })
-    @RequiresPermissions("business:worktype:create")
-    public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        return ApiResponse.success(memberService.importBatch(file,this.getLoginUser(token)));
+    @CloudRequiredPermission("business:member:create")
+    public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file,@ApiParam(value = "companyType") Integer companyType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(memberService.importBatch(file,companyType,this.getLoginUser(token)));
     }
 
     @ApiOperation("鎵归噺鎷夐粦")
@@ -315,7 +318,6 @@
         }
         return ApiResponse.success("鍚屾鎴愬姛");
     }
-
 
 
     @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")

--
Gitblit v1.9.3