feat(wms): 自建物料数据权限，显示所属部门

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java

@@ -80,6 +80,8 @@ public class WmsBaseProduct extends TenantEntity {
     @TableField(exist = false)
     private String createByName;
     @TableField(exist = false)
+    private String deptName;//部门名称
+    @TableField(exist = false)
     private String updateByName;
 
 

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseProductBo.java

@@ -69,5 +69,4 @@ public class WmsBaseProductBo extends BaseEntity {
     private String activeFlag;
     private String externalBrand;
 
-
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java

@@ -126,4 +126,6 @@ public class WmsBaseProductVo implements Serializable {
     private String unitName;
     private String createByName;
     private String updateByName;
+
+    private String deptName;//部门名称
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseProductMapper.java

@@ -1,15 +1,18 @@
 package org.dromara.wms.mapper;
 
-import java.util.List;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.wms.domain.WmsBaseProduct;
 import org.dromara.wms.domain.vo.WmsBaseProductVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 海威成品信息Mapper接口
  *
@@ -35,5 +38,10 @@ public interface WmsBaseProductMapper extends BaseMapperPlus<WmsBaseProduct, Wms
      * @return 海威成品信息集合
      */
     public List<WmsBaseProductVo> selectCustomWmsBaseProductVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsBaseProduct> queryWrapper);
-
+    //
+    // @DataPermission({@DataColumn(key = "deptName", value = "t.dept_id")})
+    // default List<WmsBaseProductVo> selectVoList(MPJLambdaWrapper<WmsBaseProduct> lqw) {
+    //     System.out.println("lqw = " + lqw);
+    //     return BaseMapperPlus.super.selectVoList(lqw);
+    // }
 }

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java

@@ -6,10 +6,12 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.BaseUnitInfo;
+import org.dromara.wms.domain.SysDept;
 import org.dromara.wms.domain.SysUser;
 import org.dromara.wms.domain.WmsBaseProduct;
 import org.dromara.wms.domain.bo.WmsBaseProductBo;
@@ -51,6 +53,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
      * @param pageQuery 分页参数
      * @return 海威成品信息分页列表
      */
+    @DataPermission({@DataColumn(key = "deptName", value = "t.create_dept")})
     @Override
     public TableDataInfo<WmsBaseProductVo> queryPageList(WmsBaseProductBo bo, PageQuery pageQuery) {
         MPJLambdaWrapper<WmsBaseProduct> lqw = buildQueryWrapper(bo);
@@ -64,7 +67,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
      * @param bo 查询条件
      * @return 海威成品信息列表
      */
-    @Override
+   @Override
     public List<WmsBaseProductVo> queryList(WmsBaseProductBo bo) {
         MPJLambdaWrapper<WmsBaseProduct> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
@@ -79,11 +82,16 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService {
             .like(StringUtils.isNotBlank(bo.getProductName()), WmsBaseProduct::getProductName, bo.getProductName())
             .like(StringUtils.isNotBlank(bo.getExternalBrand()), WmsBaseProduct::getExternalBrand, bo.getExternalBrand())
             .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag())
+            .eq(bo.getCreateDept() !=null, WmsBaseProduct::getCreateDept, bo.getCreateDept())
+            // 创建人
             .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getCreateBy)
             .selectAs(SysUser::getNickName, WmsBaseProduct::getCreateByName)
+            // 更新人
             .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getUpdateBy)
             .selectAs(SysUser::getNickName, WmsBaseProduct::getUpdateByName)
-            ;
+            // 部门
+            .leftJoin(SysDept.class, SysDept::getDeptId, WmsBaseProduct::getCreateDept)
+            .selectAs(SysDept::getDeptName, WmsBaseProduct::getDeptName);
 
 
     }