Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.java

@@ -18,7 +18,6 @@ public interface BaseProductMapper extends BaseMapper<BaseProduct> {
 
     IPage<BaseProductVo> selectPageVo(IPage<BaseProduct> page,@Param(Constants.WRAPPER) QueryWrapper<BaseProduct> qw);
 
-//    List<BaseProductChildVo> selChildrenList(@Param("sid") String sid, @Param("cSid") String cSid);
     List<BaseProductChildVo> selChildrenList(@Param("sid") String sid);
 
     int checkByGoodsSidAndUseOrgSid(@Param("goodsSid") String goodsSid, @Param("useOrgSid") String useOrgSid);

src/main/java/com/yxt/goods/biz/baseproduct/BaseProductMapper.xml

@@ -34,9 +34,6 @@
             p.sid,
             mg.goodsName AS materialName,
             mg.goodsCode AS materialCode,
---             g.goodsName AS productName,
---             g.goodsCode AS productCode,
---             p.rateType,
             m.rate,
             m.sid AS cSid
         FROM
@@ -45,8 +42,6 @@
                 LEFT JOIN goods_spu AS g ON p.goodsSid = g.sid
                 LEFT JOIN goods_spu AS mg ON m.materialSid = mg.sid
         WHERE p.sid = #{sid}
---           and m.sid != #{cSid}
-
     </select>
     <select id="checkByGoodsSidAndUseOrgSid" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM base_product WHERE goodsSid = #{goodsSid} and useOrgSid = #{useOrgSid}

src/main/java/com/yxt/goods/biz/baseproduct/BaseProductService.java

@@ -70,14 +70,13 @@ public class BaseProductService extends MybatisBaseService<BaseProductMapper, Ba
         if (!records.isEmpty()) {
             for (BaseProductVo record : records) {
                 String num = record.getNum();
+                record.setCSid(record.getSid());
                 int i = Integer.parseInt(num);
                 if (i > 1) {
-                    record.setProductCode("");
-                    record.setProductName("");
                     record.setRate("");
-//                    String childSid = record.getCSid();
+                    record.setMaterialCode("");
+                    record.setMaterialName("");
                     String sid = record.getSid();
-//                    List<BaseProductChildVo> children = baseMapper.selChildrenList(sid, childSid);
                     List<BaseProductChildVo> children = baseMapper.selChildrenList(sid);
                     if (!children.isEmpty()) {
                         record.setChildren(children);