From 851aa3d5d8bc4920a86ea683198f736a043213b5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 十月 2025 10:21:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 03c2fc9..5b92633 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
@@ -12,9 +13,11 @@
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.model.TUserMajor;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
+import com.ruoyi.system.service.TMajorService;
import com.ruoyi.system.service.TUserMajorService;
import com.ruoyi.system.vo.TAppUserPageVo;
import io.swagger.annotations.Api;
@@ -25,6 +28,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -42,12 +46,14 @@
private final TokenService tokenService;
private final TAppUserService appUserService;
private final TUserMajorService userMajorService;
+ private final TMajorService majorService;
@Autowired
- public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService) {
+ public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService, TMajorService majorService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
this.userMajorService = userMajorService;
+ this.majorService = majorService;
}
/**
@@ -213,10 +219,22 @@
*/
// @PreAuthorize("@ss.hasPermi('system:user:auditUser')")
@ApiOperation(value = "人员详情", response = AuditUserDto.class)
- @GetMapping(value = "/api/t-app-user/detailUser")
+ @PostMapping(value = "/api/t-app-user/detailUser")
public R<TAppUser> detailUser(@RequestBody String param) {
UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
TAppUser tAppUser = appUserService.getById(dto.getId());
+ List<TUserMajor> list = userMajorService.list(new LambdaQueryWrapper<TUserMajor>().eq(TUserMajor::getAppUserId, dto.getId()));
+ if(!list.isEmpty()){
+ List<String> mjIds = list.stream().map(TUserMajor::getMajorId).collect(Collectors.toList());
+ List<TMajor> mjList = majorService.list(new LambdaQueryWrapper<TMajor>().in(TMajor::getId, mjIds));
+ for (TUserMajor tUserMajor : list) {
+ TMajor tMajor = mjList.stream().filter(mj -> mj.getId().equals(tUserMajor.getMajorId())).findFirst().orElse(null);
+ if(tMajor!=null){
+ tUserMajor.setIndicator(tMajor.getMajorName());
+ }
+ }
+ }
+ tAppUser.setUserMajors(list);
return R.ok(tAppUser);
}
--
Gitblit v1.7.1