Browse Source

优化:产品管理修改关联主体。

lym 4 years ago
parent
commit
cf231f96c3

+ 2 - 0
carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductBelongForm.java

@@ -28,4 +28,6 @@ public class ProductBelongForm extends BaseForm {
     private Integer belongType;
 
     private String condition;
+
+    private Integer familyNum;
 }

+ 1 - 1
carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/ProductInfoServiceImpl.java

@@ -310,7 +310,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
                 productBelong.setFkFarmerGuid(productBelongForm.getGuid());
             }
             productBelong.setBelongType(1);
-            productBelong.setFarmerNum(productBelongForm.getFarmerNum());
+            productBelong.setFarmerNum(productBelongForm.getFamilyNum());
             productBelongs.add(productBelong);
         }
         return productBelongs;

+ 3 - 0
carbon-back/carbon-back-service/src/main/resources/carbon/GoodsInfoMapper.xml

@@ -353,6 +353,9 @@
             <if test="goodsName != null and goodsName != ''">
                 and goods.goods_name like concat('%', #{goodsName,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="isSale != null">
+                and goods.is_sale = #{isSale}
+            </if>
         </where>
         order by modified_time desc
     </select>