From d8ccb97ad41015b02f6fcd905f282937ce38e4d9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 18:17:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java |    3 +++
 1 files changed, 3 insertions(+), 0 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..5f8bc42 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;
@@ -217,6 +218,8 @@
     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()));
+        tAppUser.setUserMajors(list);
         return R.ok(tAppUser);
     }
 

--
Gitblit v1.7.1