From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 f84442c..97fabc9 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,12 +4,18 @@
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
-
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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
@@ -24,7 +30,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));
}
@@ -37,8 +44,32 @@
@PostMapping("/updMembeOne")
@InnerAuth
- public R updMembeOne(@RequestBody Long userId) {
- return R.ok(memberService.getById(userId));
+ public R updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO) {
+ memberService.updMembeOne(dMembeOneDTO);
+ return R.ok();
}
+ @InnerAuth
+ @PostMapping("/list-by-condition")
+ R<List<Member>> getMemberListByCondition(@RequestBody MemberDTO memberDTO) {
+ return R.ok(memberService.getMemberListByCondition(memberDTO));
+ }
+
+ @InnerAuth
+ @PostMapping("/list-by-level")
+ R<List<Member>> getMemberListByLevel(@RequestBody List<String> memberLevelList) {
+ return R.ok(memberService.getMemberListByLevel(memberLevelList));
+ }
+
+ /**
+ * 根据sys_user表的user_id查询member
+ *
+ * @param userId
+ * @return
+ */
+ @InnerAuth
+ @GetMapping("/getMemberByUserId/{userId}")
+ R<Member> getMemberByUserId(@PathVariable("userId") Long userId) {
+ return R.ok(memberService.getMemberByUserId(userId));
+ }
}
--
Gitblit v1.7.1