Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockVO.java

@@ -15,7 +15,9 @@ import java.util.Date;
 @ApiModel
 @Data
 public class WorkerStockVO {
-
+    @ZfireField(hide = true)
+    @ApiModelProperty("id")
+    private String id;
     @ZfireField(hide = true)
     @ApiModelProperty("所属商户id")
     private String companyWechatId;

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -289,7 +289,7 @@ public class WorkerStockLogic {
         }
         final List<WorkerStock> stockList = workerStockService.lambdaQuery()
                 .eq(WorkerStock::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .eq(WorkerStock::getId, ids)
+                .in(WorkerStock::getId, ids)
                 .eq(WorkerStock::getGoodsType, WebsitGoodsTypeEnum.M.getKey())
                 .list();
 
@@ -309,7 +309,7 @@ public class WorkerStockLogic {
                         .map(WorkerStock::getGoodsId).collect(Collectors.toList());
                 final List<WorkerStockAcc> workerStockAccs = workerStockAccService.lambdaQuery()
                         .eq(WorkerStockAcc::getCompanyWechatId, adminUser.getCompanyWechatId())
-                        .eq(WorkerStockAcc::getGoodsId, goodsIds)
+                        .in(WorkerStockAcc::getGoodsId, goodsIds)
                         .list();
 
                 for (WorkerStock stock : workerStock.getValue()) {