chore: 合并冲突解决

src/main/java/com/youlai/boot/core/security/manager/JwtTokenManager.java

@@ -188,7 +188,7 @@ public class JwtTokenManager implements TokenManager {
      *
      * @param authentication 认证信息
      * @param ttl           过期时间
-     * @return
+     * @return JWT Token
      */
     private String generateToken(Authentication authentication, int ttl) {
 

src/main/java/com/youlai/boot/system/controller/UserController.java

@@ -1,6 +1,5 @@
 package com.youlai.boot.system.controller;
 
-import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -64,7 +63,6 @@ public class UserController {
             @Valid UserPageQuery queryParams
     ) {
         IPage<UserPageVO> result = userService.getUserPage(queryParams);
-
         return PageResult.success(result);
     }
 

src/main/java/com/youlai/boot/system/mapper/UserMapper.java

@@ -25,11 +25,11 @@ public interface UserMapper extends BaseMapper<User> {
     /**
      * 获取用户分页列表
      *
-     * @param page       分页参数
+     * @param page        分页参数
      * @param queryParams 查询参数
      * @return 用户分页列表
      */
-    @DataPermission(deptAlias = "u")
+    @DataPermission(deptAlias = "u", userAlias = "u")
     Page<UserBO> getUserPage(Page<UserBO> page, UserPageQuery queryParams);
 
     /**
@@ -70,7 +70,7 @@ public interface UserMapper extends BaseMapper<User> {
      * @param queryParams 查询参数
      * @return 导出用户列表
      */
-    @DataPermission(deptAlias = "u")
+    @DataPermission(deptAlias = "u", userAlias = "u")
     List<UserExportDTO> listExportUsers(UserPageQuery queryParams);
 
     /**

src/main/java/com/youlai/boot/system/model/form/PasswordResetForm.java

@@ -1,23 +0,0 @@
-package com.youlai.boot.system.model.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 重置密码表单
- *
- * @author Ray
- * @since 2024/8/13
- */
-@Schema(description = "重置密码表单")
-@Data
-public class PasswordResetForm {
-
-    @Schema(description = "用户ID")
-    private Long userId;
-
-    @Schema(description = "密码")
-    private String password;
-
-
-}

src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java

@@ -241,13 +241,13 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
         MenuTypeEnum menuType = menuForm.getType();
 
-        if (menuType == MenuTypeEnum.CATALOG) {  // 如果是外链
+        if (menuType == MenuTypeEnum.CATALOG) {  // 如果是目录
             String path = menuForm.getRoutePath();
             if (menuForm.getParentId() == 0 && !path.startsWith("/")) {
                 menuForm.setRoutePath("/" + path); // 一级目录需以 / 开头
             }
             menuForm.setComponent("Layout");
-        } else if (menuType == MenuTypeEnum.EXTLINK) {   // 如果是目录
+        } else if (menuType == MenuTypeEnum.EXTLINK) {   // 如果是外链
 
             menuForm.setComponent(null);
         }

src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java

@@ -50,11 +50,8 @@ import java.util.stream.Collectors;
 public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements NoticeService {
 
     private final NoticeConverter noticeConverter;
-
     private final UserNoticeService userNoticeService;
-
     private final UserService userService;
-
     private final SimpMessagingTemplate messagingTemplate;
     private final OnlineUserService onlineUserService;
 
@@ -266,10 +263,9 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     }
 
     /**
-     * 阅读获取通知公告详情
      *
      * @param id 通知公告ID
-     * @return
+     * @return NoticeDetailVO 通知公告详情
      */
     @Override
     public NoticeDetailVO getNoticeDetail(Long id) {

src/main/resources/mapper/system/UserMapper.xml

@@ -24,7 +24,9 @@
                 LEFT JOIN sys_user_role sur ON u.id = sur.user_id
                 LEFT JOIN sys_role r ON sur.role_id = r.id
         <where>
-            u.is_deleted = 0 AND u.username != 'root'
+            u.is_deleted = 0
+            <!-- 超级管理员不显示在列表 -->
+            AND r.name != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}'
             <if test='queryParams.keywords!=null and queryParams.keywords.trim() neq ""'>
                 AND (
                     u.username LIKE CONCAT('%',#{queryParams.keywords},'%')
@@ -118,9 +120,9 @@
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="password" column="password" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="BOOLEAN"/>
-        <result property="deptId" column="dept_id" jdbcType="BIGINT"></result>
+        <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
         <collection property="roles" ofType="string" javaType="java.util.Set">
-            <result column="code"></result>
+            <result column="code" />
         </collection>
     </resultMap>
 
@@ -191,7 +193,7 @@
             sys_user u
                 LEFT JOIN sys_dept d ON u.dept_id = d.id
         <where>
-            u.is_deleted = 0 AND u.username != 'root'
+            u.is_deleted = 0
             <if test='keywords!=null and keywords.trim() neq ""'>
                 AND (u.username LIKE CONCAT('%',#{keywords},'%')
                 OR u.nickname LIKE CONCAT('%',#{keywords},'%')