From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
index 0ea2219..472c4fb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
@@ -4,13 +4,16 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.Member;
-import java.util.List;
-import java.util.Set;
-
+import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
-import io.swagger.annotations.ApiOperation;
+import java.util.Collection;
+import java.util.List;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
* @author mitao
@@ -25,7 +28,8 @@
@InnerAuth
@PostMapping("/list-by-ids")
- R<List<Member>> getMemberListByIds(@RequestParam("memberIdList") Set<Long> memberIdList) {
+ R<List<Member>> getMemberListByIds(
+ @RequestParam("memberIdList") Collection<Long> memberIdList) {
return R.ok(memberService.getMemberListByIds(memberIdList));
}
@@ -43,4 +47,9 @@
return R.ok();
}
+ @InnerAuth
+ @PostMapping("/member/list-by-condition")
+ R<List<Member>> getMemberListByCondition(@RequestBody MemberDTO memberDTO) {
+ return R.ok(memberService.getMemberListByCondition(memberDTO));
+ }
}
--
Gitblit v1.7.1