From 533c9ea5a12beac844afddae2d8148dc741e93dd Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 12 Jul 2024 17:59:18 +0800 Subject: [PATCH] 7/12 --- .../goodsbrandinfo/GoodsBrandInfoMapper.xml | 3 +- .../goodsbrandinfo/GoodsBrandInfoQuery.java | 9 ++++ .../goodsbrandinfo/GoodsBrandInfoService.java | 39 ++++++++++++------ .../GoodsManufacturerMapper.xml | 3 +- .../GoodsManufacturerQuery.java | 9 ++++ .../GoodsManufacturerService.java | 29 ++++++++++++- .../yxt/goods/biz/goodsspu/GoodsSpuMapper.xml | 1 + .../yxt/goods/biz/goodsspu/GoodsSpuQuery.java | 9 ++++ .../goods/biz/goodsspu/GoodsSpuService.java | 39 +++++++++++++----- .../goods/biz/goodstype/GoodsTypeMapper.xml | 3 +- .../goods/biz/goodstype/GoodsTypeQuery.java | 9 ++++ .../goods/biz/goodstype/GoodsTypeService.java | 41 +++++++++++++++---- .../goods/biz/goodsunit/GoodsUnitMapper.xml | 3 +- .../goods/biz/goodsunit/GoodsUnitQuery.java | 9 ++++ .../goods/biz/goodsunit/GoodsUnitService.java | 29 ++++++++++++- 15 files changed, 194 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml index e3f4fae..d3f6bc4 100644 --- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml @@ -7,7 +7,8 @@ select * - from goods_manufacturer + from goods_manufacturer a + LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java index ee3bb4f..41d8bb6 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerQuery.java @@ -1,6 +1,7 @@ package com.yxt.goods.biz.goodsmanufacturer; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,4 +13,12 @@ public class GoodsManufacturerQuery implements Query { private String name; private String userOrgSid; private String createOrgSid;//创建组织sid + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java index 7988915..dadff3a 100644 --- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java +++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoVo; import com.yxt.goods.utils.OrgPathQuery; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -32,10 +33,34 @@ public class GoodsManufacturerService extends MybatisBaseService qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) + String orgLevelKey=query.getOrgLevelKey(); + String orgSidPath=query.getOrgPath(); + int index=query.getIndex(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.apply("s.orgSidPath like('"+orgSidPath+"')"); + } else if ("4".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if(StringUtils.isNotBlank(query.getName())){ - qw.like("goodsTypeName",query.getName()); + qw.like("a.goodsTypeName",query.getName()); } - qw.ne("isDelete","1"); + qw.ne("a.isDelete","1"); qw.orderByDesc("sortNo"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml index e2fb2cc..d6656b5 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml @@ -11,6 +11,7 @@ left join goods_type a on a.sid=s.goodsTypeSid left join goods_brand_info b on b.sid=s.brandSid left join goods_manufacturer c on c.sid=s.manufacturerSid + LEFT JOIN ss_user.sys_organization as d ON s.useOrgSid = d.sid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java index 43c3541..42bd4c6 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java @@ -1,6 +1,7 @@ package com.yxt.goods.biz.goodsspu; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,4 +13,12 @@ public class GoodsSpuQuery implements Query { private String name; private String userOrgSid; private String createOrgSid;//创建组织sid + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java index ed3a521..b8bd0fd 100644 --- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java +++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.goods.apiadmin.GoodsBrandRest; import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfo; import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoService; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo; import com.yxt.goods.biz.goodssku.GoodsSku; import com.yxt.goods.biz.goodssku.GoodsSkuDto; import com.yxt.goods.biz.goodssku.GoodsSkuService; @@ -73,25 +74,41 @@ public class GoodsSpuService extends MybatisBaseService qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) + String orgLevelKey=query.getOrgLevelKey(); + String orgSidPath=query.getOrgPath(); + int index=query.getIndex(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("d.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("d.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.apply("d.orgSidPath like('"+orgSidPath+"')"); + } else if ("4".equals(orgLevelKey)) { + qw.eq("s.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if (StringUtils.isNotBlank(query.getName())) { - qw.like("goodsName", query.getName()); + qw.like("s.goodsName", query.getName()); } -// if(StringUtils.isNotBlank(query.getUserOrgSid())){ -// qw.eq("userOrgSid",query.getUserOrgSid()); -// } + qw.ne("s.isDelete","1"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); records.removeAll(Collections.singleton(null)); -// if (!records.isEmpty()) { -// for (BaseGoodsSpuVo record : records) { -// if (StringUtils.isNotBlank(record.getPicUrl())) { -// record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl()); -// } -// } -// } + return rb.success().setData(p); } diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml index 63eac8d..905164f 100644 --- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml +++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml @@ -7,7 +7,8 @@ select * - from goods_unit + from goods_unit a + LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java index f82b18e..00856c8 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitQuery.java @@ -1,6 +1,7 @@ package com.yxt.goods.biz.goodsunit; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,4 +13,12 @@ public class GoodsUnitQuery implements Query { private String name; private String userOrgSid; private String createOrgSid;//创建组织sid + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; } diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java index 01fe615..e8fe83b 100644 --- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java +++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java @@ -10,6 +10,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo; import com.yxt.goods.utils.OrgPathQuery; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -32,10 +33,34 @@ public class GoodsUnitService extends MybatisBaseService qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) + String orgLevelKey=query.getOrgLevelKey(); + String orgSidPath=query.getOrgPath(); + int index=query.getIndex(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.apply("s.orgSidPath like('"+orgSidPath+"')"); + } else if ("4".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if(StringUtils.isNotBlank(query.getName())){ - qw.like("unitName",query.getName()); + qw.like("a.unitName",query.getName()); } - qw.ne("isDelete","1"); + qw.ne("a.isDelete","1"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null);