diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java
index edb70e59..5545c566 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java
@@ -65,4 +65,8 @@ public class WmsDeptVo {
     private String remark;
 
 
+    // 领导昵称
+    private String leaderNickName;
+
+
 }
diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java
index bd7677d1..3138e5fd 100644
--- a/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java
+++ b/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java
@@ -1,8 +1,12 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.klp.domain.WmsDept;
 import com.klp.domain.vo.WmsDeptVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * WMS系统部门（树形结构）Mapper接口
@@ -12,4 +16,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsDeptMapper extends BaseMapperPlus<WmsDeptMapper, WmsDept, WmsDeptVo> {
 
+    List<WmsDeptVo> selectVoListPlus(@Param("ew") QueryWrapper<WmsDept> lqw);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java
index f9e015cc..83f00078 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java
@@ -2,6 +2,7 @@ package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
@@ -42,21 +43,23 @@ public class WmsDeptServiceImpl implements IWmsDeptService {
      */
     @Override
     public List<WmsDeptVo> queryList(WmsDeptBo bo) {
-        LambdaQueryWrapper<WmsDept> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<WmsDept> lqw = buildQueryWrapperPlus(bo);
+        return baseMapper.selectVoListPlus(lqw);
     }
 
-    private LambdaQueryWrapper<WmsDept> buildQueryWrapper(WmsDeptBo bo) {
+    private QueryWrapper<WmsDept> buildQueryWrapperPlus(WmsDeptBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<WmsDept> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getParentId() != null, WmsDept::getParentId, bo.getParentId());
-        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), WmsDept::getDeptName, bo.getDeptName());
-        lqw.eq(bo.getOrderNum() != null, WmsDept::getOrderNum, bo.getOrderNum());
-        lqw.eq(bo.getLeader() != null, WmsDept::getLeader, bo.getLeader());
-        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsDept::getStatus, bo.getStatus());
-        return lqw;
+        QueryWrapper<WmsDept> qw = new QueryWrapper<>();
+        qw.eq(bo.getParentId() != null, "wd.parent_id", bo.getParentId());
+        qw.like(StringUtils.isNotBlank(bo.getDeptName()), "wd.dept_name", bo.getDeptName());
+        qw.eq(bo.getOrderNum() != null, "wd.order_num", bo.getOrderNum());
+        qw.eq(bo.getLeader() != null, "wd.leader", bo.getLeader());
+        qw.eq(StringUtils.isNotBlank(bo.getStatus()), "wd.status", bo.getStatus());
+        qw.setEntityClass(WmsDept.class);
+        return qw;
     }
 
+
     /**
      * 新增WMS系统部门（树形结构）
      */
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml
index 3adbc4b0..529de0f3 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml
@@ -18,6 +18,25 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
+    <select id="selectVoListPlus" resultType="com.klp.domain.vo.WmsDeptVo">
+        SELECT
+            d.dept_id,
+            d.parent_id,
+            d.dept_name,
+            d.order_num,
+            d.leader,
+            u.nick_name AS leaderNickName,
+            d.status,
+            d.del_flag,
+            d.remark,
+            d.create_time,
+            d.create_by,
+            d.update_time,
+            d.update_by
+        FROM wms_dept d
+        LEFT JOIN sys_user u ON d.leader = u.user_id
+        ${ew.customSqlSegment}
+    </select>
 
 
 </mapper>