From a56cbbb078ae3d69d6cc0d8dd8a126171be17ed8 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Thu, 5 Mar 2026 23:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B9=E7=9B=AE=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HomeModuleUserController.java  | 33 ++++++++-----------
 .../mybigscreen/biz/mapper/CompanyMapper.java |  4 +--
 .../biz/mapper/HomeRoleMapper.java            |  4 +--
 .../biz/mapper/HomeRoleMenuMapper.java        |  4 +--
 .../biz/mapper/IndexInfoMapper.java           |  4 +--
 .../biz/mapper/ItemInfoMapper.java            |  4 +--
 .../biz/mapper/ResumeEmployeeMapper.java      |  4 +--
 .../biz/mapper/WebsiteStorageMapper.java      |  4 +--
 8 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java
index 47041e4..323bcd8 100644
--- a/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java
+++ b/src/main/java/com/mini/mybigscreen/biz/controller/HomeModuleUserController.java
@@ -1,13 +1,13 @@
 package com.mini.mybigscreen.biz.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mini.mybigscreen.Model.Message;
 import com.mini.mybigscreen.Model.Result;
 import com.mini.mybigscreen.biz.domain.HomeModule;
 import com.mini.mybigscreen.biz.domain.HomeModuleUser;
 import com.mini.mybigscreen.biz.domain.HomeUser;
 import com.mini.mybigscreen.biz.service.HomeModuleService;
-import com.mini.mybigscreen.biz.service.HomeModuleUserService;
 import com.mini.mybigscreen.biz.service.HomeUserService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -39,27 +37,24 @@ public class HomeModuleUserController {
     @Resource
     private HomeModuleService moduleService;
 
-    @Resource
-    private HomeModuleUserService moduleUserService;
-
 
     @GetMapping("list")
     public Result<List<HomeModule>> getList(HttpServletRequest request) {
         HttpSession session = request.getSession(false);
         String userName = (String) session.getAttribute("userName");
-        QueryWrapper<HomeUser> userQuery = new QueryWrapper<>();
-        userQuery.eq("user_name", userName);
+        LambdaQueryWrapper<HomeUser> userQuery = new LambdaQueryWrapper<HomeUser>()
+                .eq(HomeUser::getUserName, userName);
         HomeUser user = userService.getOne(userQuery);
-        QueryWrapper<HomeModuleUser> moduleUserQuery = new QueryWrapper<>();
-        moduleUserQuery.eq("user_id", user.getUserId())
-                .eq("ustatus","1");
-        List<HomeModuleUser> homeModuleUserList = moduleUserService.list(moduleUserQuery);
-        QueryWrapper<HomeModule> moduleQuery = new QueryWrapper<>();
-        moduleQuery.in("module_id", homeModuleUserList.stream()
-                .map(HomeModuleUser::getModuleId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList()));
-        return Result.success(moduleService.list(moduleQuery));
+        MPJLambdaWrapper<HomeModule> wrapper = new MPJLambdaWrapper<HomeModule>()
+                .selectAll(HomeModule.class)
+                .leftJoin(HomeModuleUser.class,
+                        HomeModuleUser::getModuleId,
+                        HomeModule::getModuleId)
+                .eq(HomeModuleUser::getUserId, user.getUserId())
+                .eq(HomeModuleUser::getUstatus, "1")
+                .isNotNull(HomeModule::getModuleId);
+        List<HomeModule> moduleList = moduleService.list(wrapper);
+        return Result.success(moduleList);
     }
 
 
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/CompanyMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/CompanyMapper.java
index 02cbf26..3fcdb0a 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/CompanyMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/CompanyMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.Company;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-03
  */
-public interface CompanyMapper extends BaseMapper<Company> {
+public interface CompanyMapper extends MPJBaseMapper<Company> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMapper.java
index 072bc89..ab7b16f 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeRole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-05
  */
-public interface HomeRoleMapper extends BaseMapper<HomeRole> {
+public interface HomeRoleMapper extends MPJBaseMapper<HomeRole> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMenuMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMenuMapper.java
index 401be75..15542af 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMenuMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/HomeRoleMenuMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.HomeRoleMenu;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-05
  */
-public interface HomeRoleMenuMapper extends BaseMapper<HomeRoleMenu> {
+public interface HomeRoleMenuMapper extends MPJBaseMapper<HomeRoleMenu> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/IndexInfoMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/IndexInfoMapper.java
index 7be93d6..cdd7db2 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/IndexInfoMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/IndexInfoMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.IndexInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-02
  */
-public interface IndexInfoMapper extends BaseMapper<IndexInfo> {
+public interface IndexInfoMapper extends MPJBaseMapper<IndexInfo> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
index 0e54c87..08fcccc 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ItemInfoMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.ItemInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-02-24
  */
-public interface ItemInfoMapper extends BaseMapper<ItemInfo> {
+public interface ItemInfoMapper extends MPJBaseMapper<ItemInfo> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/ResumeEmployeeMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/ResumeEmployeeMapper.java
index daf8c80..6528a2b 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/ResumeEmployeeMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/ResumeEmployeeMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.ResumeEmployee;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-03
  */
-public interface ResumeEmployeeMapper extends BaseMapper<ResumeEmployee> {
+public interface ResumeEmployeeMapper extends MPJBaseMapper<ResumeEmployee> {
 
 }
diff --git a/src/main/java/com/mini/mybigscreen/biz/mapper/WebsiteStorageMapper.java b/src/main/java/com/mini/mybigscreen/biz/mapper/WebsiteStorageMapper.java
index 5ef2bf9..326b466 100644
--- a/src/main/java/com/mini/mybigscreen/biz/mapper/WebsiteStorageMapper.java
+++ b/src/main/java/com/mini/mybigscreen/biz/mapper/WebsiteStorageMapper.java
@@ -1,7 +1,7 @@
 package com.mini.mybigscreen.biz.mapper;
 
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mini.mybigscreen.biz.domain.WebsiteStorage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author gaoxq
  * @since 2026-03-03
  */
-public interface WebsiteStorageMapper extends BaseMapper<WebsiteStorage> {
+public interface WebsiteStorageMapper extends MPJBaseMapper<WebsiteStorage> {
 
 }