From 354ca1314bc5305ebf87dfae46037b83470583ac Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 18 Jul 2024 08:42:50 +0800
Subject: [PATCH] 7/18

---
 .../com/yxt/goods/apiadmin/GoodsSpuRest.java     |  8 +++++++-
 .../biz/goodsbrandinfo/GoodsBrandInfoDto.java    |  2 ++
 .../biz/goodsbrandinfo/GoodsBrandInfoMapper.java |  2 ++
 .../biz/goodsbrandinfo/GoodsBrandInfoMapper.xml  |  9 +++++++++
 .../goodsbrandinfo/GoodsBrandInfoService.java    | 16 +++++-----------
 .../biz/goodsbrandinfo/GoodsBrandInfoVo.java     |  2 ++
 .../goodsmanufacturer/GoodsManufacturerDto.java  |  2 ++
 .../GoodsManufacturerMapper.java                 |  2 ++
 .../GoodsManufacturerMapper.xml                  |  9 +++++++++
 .../GoodsManufacturerService.java                |  7 +++++--
 .../goodsmanufacturer/GoodsManufacturerVo.java   |  2 ++
 .../com/yxt/goods/biz/goodsspu/GoodsSpuDto.java  |  2 ++
 .../yxt/goods/biz/goodsspu/GoodsSpuMapper.java   |  2 ++
 .../yxt/goods/biz/goodsspu/GoodsSpuMapper.xml    |  9 +++++++++
 .../yxt/goods/biz/goodsspu/GoodsSpuService.java  | 12 +++++++++++-
 .../com/yxt/goods/biz/goodsspu/GoodsSpuVo.java   |  2 ++
 .../yxt/goods/biz/goodstype/GoodsTypeMapper.java |  2 ++
 .../yxt/goods/biz/goodstype/GoodsTypeMapper.xml  |  9 +++++++++
 .../goods/biz/goodstype/GoodsTypeService.java    |  7 +++++--
 .../com/yxt/goods/biz/goodstype/GoodsTypeVo.java |  2 ++
 .../com/yxt/goods/biz/goodsunit/GoodsUnit.java   |  4 +++-
 .../yxt/goods/biz/goodsunit/GoodsUnitDto.java    |  4 ++++
 .../yxt/goods/biz/goodsunit/GoodsUnitMapper.java |  2 ++
 .../yxt/goods/biz/goodsunit/GoodsUnitMapper.xml  |  9 +++++++++
 .../goods/biz/goodsunit/GoodsUnitService.java    |  7 +++++--
 .../com/yxt/goods/biz/goodsunit/GoodsUnitVo.java |  4 ++++
 26 files changed, 118 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
index 5ea64ef..e971603 100644
--- a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
@@ -1,5 +1,6 @@
 package com.yxt.goods.apiadmin;
 
+import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfo;
 import com.yxt.goods.biz.goodsspu.GoodsSpuDto;
 import com.yxt.goods.biz.goodsspu.GoodsSpuQuery;
 import com.yxt.goods.biz.goodsspu.GoodsSpuService;
@@ -7,6 +8,7 @@ import com.yxt.goods.biz.goodsspu.GoodsSpuVo;
 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.utils.OrgPathQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +35,11 @@ public class GoodsSpuRest {
     public ResultBean<PagerVo<GoodsSpuVo>> listPage(@RequestBody PagerQuery<GoodsSpuQuery> pq) {
         return goodsSpuService.listPage(pq);
     }
-
+    @ApiOperation("查询所有")
+    @PostMapping("/listAll")
+    public ResultBean<List<GoodsSpuVo>> listAll(@RequestBody OrgPathQuery query) {
+        return goodsSpuService.listAll(query);
+    }
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
     public ResultBean<String> saveOrUpdate(@RequestBody GoodsSpuDto dto) {
diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java
index 845db4e..c11c9da 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoDto.java
@@ -24,4 +24,6 @@ public class GoodsBrandInfoDto implements Dto {
     private String letter;//品牌的首字母大写
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java
index 0831e4d..747aea6 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.java
@@ -17,4 +17,6 @@ import java.util.List;
 public interface GoodsBrandInfoMapper extends BaseMapper<GoodsBrandInfo> {
     int updateBySidIsDelete(List<String> list);
     IPage<GoodsBrandInfoVo> listPage(IPage<GoodsBrandInfo> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsBrandInfo> qw);
+    List<GoodsBrandInfoVo> listAll(@Param("orgPath")String orgPath);
+
 }
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 d3f6bc4..c7f1135 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
@@ -13,6 +13,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoVo">
+        select
+        *
+        from goods_brand_info a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+        </where>
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE goods_brand_info
         SET isDelete=1
diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
index 041b928..a7cc53b 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
@@ -73,10 +73,7 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
     }
     public ResultBean<List<GoodsBrandInfo>> listAll( OrgPathQuery query) {
     ResultBean rb = ResultBean.fireFail();
-
-//    List<GoodsBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<GoodsBrandInfo>().eq("isEnable",1).ne("isDelete","1")
-//            .eq("userOrgSid",query.getUserOrgSid()));
-        List<GoodsBrandInfo> pagging = baseMapper.selectList(new QueryWrapper<GoodsBrandInfo>().eq("isEnable",1).ne("isDelete","1"));
+        List<GoodsBrandInfoVo> pagging = baseMapper.listAll(query.getOrgPath());
     return rb.success().setData(pagging);
 }
     public ResultBean<String> saveOrUpdate(GoodsBrandInfoDto dto) {
@@ -107,6 +104,9 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
 //                String path = dto.getBigPic().substring(urlPrefix.length());
 //                wmsGoodsBrand.setBigPic(path);
 //            }
+            wmsGoodsBrand.setCreateBySid(dto.getUserSid());
+            wmsGoodsBrand.setCreateOrgSid(dto.getOrgPath());
+            wmsGoodsBrand.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoodsBrand);
         }
         return rb.success().setMsg("成功");
@@ -118,13 +118,7 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
         GoodsBrandInfo wmsGoodsBrand = fetchBySid(sid);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         BeanUtil.copyProperties(wmsGoodsBrand, vo);
-//        if (null != wmsGoodsBrand) {
-//
-//            if (StringUtils.isNotBlank(wmsGoodsBrand.getBigPic())) {
-//                vo.setBigPic(fileUploadComponent.getUrlPrefix() + wmsGoodsBrand.getBigPic());
-//            }
-////            vo.setCreateTime(sdf.format(lpkGoods.getCreateTime()));
-//        }
+        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java
index 1674323..26f93a3 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoVo.java
@@ -29,4 +29,6 @@ public class GoodsBrandInfoVo implements Vo {
     private String letter;//品牌的首字母大写
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerDto.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerDto.java
index 30abbee..3951135 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerDto.java
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerDto.java
@@ -32,4 +32,6 @@ public class GoodsManufacturerDto implements Dto {
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.java
index b272ac9..00d9899 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.goods.biz.goodsbrandinfo.GoodsBrandInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@ public interface GoodsManufacturerMapper extends BaseMapper<GoodsManufacturer> {
 
     List<GoodsManufacturerVo> getAllTypeByUseOrgSid(@Param("useOrgSid") String useOrgSid);
     int updateBySidIsDelete(List<String> list);
+    List<GoodsManufacturerVo> listAll(@Param("orgPath")String orgPath);
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
index a97ee44..49d4c8d 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
@@ -13,6 +13,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo">
+        select
+        *
+        from goods_manufacturer a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+        </where>
+    </select>
     <select id="getAllTypeByUseOrgSid" resultType="com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo">
         select *
         from goods_manufacturer
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 dadff3a..944360f 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
@@ -72,8 +72,7 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
         ResultBean rb = ResultBean.fireFail();
 //        List<GoodsManufacturer> pagging = baseMapper.selectList(new QueryWrapper<GoodsManufacturer>().eq("isEnable",1).ne("isDelete","1")
 //                .eq("userOrgSid",query.getUserOrgSid()));
-        List<GoodsManufacturer> pagging = baseMapper.selectList(new QueryWrapper<GoodsManufacturer>().eq("isEnable",1).ne("isDelete","1")
-                );
+        List<GoodsManufacturerVo> pagging = baseMapper.listAll(query.getOrgPath());
         return rb.success().setData(pagging);
     }
 
@@ -96,6 +95,9 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
 //                String path = dto.getPicUrl().substring(urlPrefix.length());
 //                lpkGoods.setPicUrl(path);
 //            }
+            wmsManufacturer.setCreateBySid(dto.getUserSid());
+            wmsManufacturer.setCreateOrgSid(dto.getOrgPath());
+            wmsManufacturer.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsManufacturer);
         }
         return rb.success().setMsg("成功");
@@ -113,6 +115,7 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
 //            }
 //            vo.setCreateTime(sdf.format(lpkGoods.getCreateTime()));
         }
+        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java
index e902b9a..1db3bd2 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerVo.java
@@ -33,4 +33,6 @@ public class GoodsManufacturerVo implements Vo {
     private String sortNo;//排序
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuDto.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuDto.java
index 0a02a99..b357df7 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuDto.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuDto.java
@@ -43,5 +43,7 @@ public class GoodsSpuDto implements Dto {
     private String createOrgSid;//创建组织sid
     private GoodsSpuDetailDto baseGoodsSpuDetail;//商品spu详情
     private List<GoodsSkuDto> baseGoodsSkus;//商品sku
+    private String userSid;
+    private String orgPath;
 
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
index b61c2ce..0102306 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,5 @@ public interface GoodsSpuMapper extends BaseMapper<GoodsSpu> {
     IPage<GoodsSpuVo> listPage(IPage<GoodsSpu> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsSpu> qw);
     GoodsSpuVo initialization(@Param("sid")String sid);
     int updateBySidIsDelete(List<String> list);
+    List<GoodsSpuVo> listAll(@Param("orgPath")String orgPath);
 }
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 d6656b5..2725329 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
@@ -16,6 +16,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
+        select
+        *
+        from goods_spu a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+        </where>
+    </select>
     <select id="initialization" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
         select
         s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
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 b8bd0fd..a75222e 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -21,11 +21,13 @@ import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailService;
 import com.yxt.goods.biz.goodsspudetail.BaseGoodsSpuDetailVo;
 import com.yxt.goods.biz.goodstype.GoodsType;
 import com.yxt.goods.biz.goodstype.GoodsTypeService;
+import com.yxt.goods.biz.goodstype.GoodsTypeVo;
 import com.yxt.goods.biz.goodsunit.GoodsUnit;
 import com.yxt.goods.biz.goodsunit.GoodsUnitService;
 import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturer;
 import com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerService;
 import com.yxt.goods.utils.ExcelUtil;
+import com.yxt.goods.utils.OrgPathQuery;
 import com.yxt.goods.utils.PinYinUtils;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -111,7 +113,11 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
 
         return rb.success().setData(p);
     }
-
+    public ResultBean<List<GoodsSpuVo>> listAll(OrgPathQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<GoodsSpuVo> pagging = baseMapper.listAll(query.getOrgPath());
+        return rb.success().setData(pagging);
+    }
     @Transactional
     public ResultBean<String> saveOrUpdate(GoodsSpuDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -154,6 +160,9 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setCreateTime(new DateTime());
             wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
+            wmsGoods.setCreateBySid(dto.getUserSid());
+            wmsGoods.setCreateOrgSid(dto.getOrgPath());
+            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
             //spu详情
             dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@@ -206,6 +215,7 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             goodsSkuVo.setBaseGoodsSkuExtend(vo2);
         }
         vo.setBaseGoodsSkus(vos);
+        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuVo.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuVo.java
index 8a9874a..538157a 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuVo.java
@@ -51,4 +51,6 @@ public class GoodsSpuVo implements Vo {
     private String brandName;
     private String manufacturerName;
     private String typeName;
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java
index 2c1ec15..991d759 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.goods.biz.goodsspu.GoodsSpuVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +19,5 @@ public interface GoodsTypeMapper extends BaseMapper<GoodsType> {
 
     int updateBySidIsDelete(List<String> list);
     IPage<GoodsTypeVo> listPage(IPage<GoodsType> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsType> qw);
+    List<GoodsTypeVo> listAll(@Param("orgPath")String orgPath);
 }
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 905164f..b5f377f 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
@@ -13,6 +13,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.yxt.goods.biz.goodstype.GoodsTypeVo">
+        select
+        *
+        from goods_type a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+        </where>
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE goods_type
         SET isDelete=1
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
index 1ea5bd8..b148f22 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
@@ -90,8 +90,7 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         ResultBean rb = ResultBean.fireFail();
 //        List<GoodsType> pagging = baseMapper.selectList(new QueryWrapper<GoodsType>().eq("isEnable",1).ne("isDelete","1")
 //                .eq("userOrgSid",query.getUserOrgSid()));
-        List<GoodsType> pagging = baseMapper.selectList(new QueryWrapper<GoodsType>().eq("isEnable",1).ne("isDelete","1")
-                );
+        List<GoodsTypeVo> pagging = baseMapper.listAll(query.getOrgPath());
         return rb.success().setData(pagging);
     }
 
@@ -121,6 +120,9 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             if(StringUtils.isBlank(wmsGoods.getIsGoodsID())){
                 wmsGoods.setIsGoodsID("1");
             }
+            wmsGoods.setCreateBySid(dto.getUserSid());
+            wmsGoods.setCreateOrgSid(dto.getOrgPath());
+            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
         }
         return rb.success().setMsg("成功");
@@ -143,6 +145,7 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             }
             vo.setSids(wmsGoodsType.getPSid());
         }
+        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
index 4f60bbe..392fb2d 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeVo.java
@@ -36,4 +36,6 @@ public class GoodsTypeVo implements Vo {
     private String createOrgSid;//创建组织sid
     private String sids;//创建组织sid
     private String outStockRule;//出库规则
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java
index 93683e3..7b29f10 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnit.java
@@ -10,5 +10,7 @@ import lombok.Data;
 @Data
 public class GoodsUnit extends BaseEntity {
 
-    private String unitName;//单位名称
+    private String unitName;//单位名称、
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java
index dfac84e..4e6cd3b 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitDto.java
@@ -24,4 +24,8 @@ public class GoodsUnitDto implements Dto {
     private String state;
     private String isDelete;
     private String unitName;//单位名称
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java
index 4efd78f..91fe804 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.goods.biz.goodstype.GoodsTypeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,4 +18,5 @@ import java.util.List;
 public interface GoodsUnitMapper extends BaseMapper<GoodsUnit> {
     IPage<GoodsUnitVo> listPage(IPage<GoodsUnit> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsUnit> qw);
     int updateBySidIsDelete(List<String> list);
+    List<GoodsUnitVo> listAll(@Param("orgPath")String orgPath);
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
index 4765902..ab3683a 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
@@ -13,6 +13,15 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.yxt.goods.biz.goodsunit.GoodsUnitVo">
+        select
+        *
+        from goods_unit a
+        LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
+        <where>
+            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+        </where>
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE goods_unit
         SET isDelete=1
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 e8fe83b..271cb86 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java
@@ -70,8 +70,7 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
         ResultBean rb = ResultBean.fireFail();
 //        List<GoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<GoodsUnit>().eq("isEnable",1).ne("isDelete","1")
 //                .eq("userOrgSid",query.getUserOrgSid()));
-        List<GoodsUnit> pagging = baseMapper.selectList(new QueryWrapper<GoodsUnit>().eq("isEnable",1).ne("isDelete","1")
-                );
+        List<GoodsUnitVo> pagging = baseMapper.listAll(query.getOrgPath());
         return rb.success().setData(pagging);
     }
 
@@ -94,6 +93,9 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
 //                String path = dto.getPicUrl().substring(urlPrefix.length());
 //                lpkGoods.setPicUrl(path);
 //            }
+            wmsGoods.setCreateBySid(dto.getUserSid());
+            wmsGoods.setCreateOrgSid(dto.getOrgPath());
+            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
         }
         return rb.success().setMsg("成功");
@@ -114,6 +116,7 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
 //            BaseGoodsUnit wmsGoodsType1 = fetchBySid(wmsGoodsType.getPSid());
 //            vo.setPName(wmsGoodsType1.getGoodsTypeName());
         }
+        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java
index 0205f89..d52e200 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitVo.java
@@ -24,4 +24,8 @@ public class GoodsUnitVo implements Vo {
     private String state;
     private String isDelete;
     private String unitName;//单位名称
+    private String useOrgSid;//使用组织sid
+    private String createOrgSid;//创建组织sid
+    private String userSid;
+    private String orgPath;
 }