FengChaoYu 9 місяців тому
батько
коміт
28ae27fb1d

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

@@ -89,8 +89,9 @@ public class WorkerStockLogic {
      * @return
      */
     public IPage<WorkerStockPVO> workerStockPList(ZfireParamBean zfireParamBean) {
+        final AdminUserCom adminUser = commonLogic.getAdminUser();
         zfireParamBean.setCompanyWechatId(commonLogic.getAdminUser().getCompanyWechatId());
-        FieldUtils.supplyParam(zfireParamBean, WorkerStockPVO.class);
+        FieldUtils.supplyParam(zfireParamBean, WorkerStockPVO.class, adminUser);
         IPage<WorkerStockPVO> page = commonMapper.workerStockPList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
         return page;
     }

+ 8 - 0
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -246,6 +246,14 @@
         join websit_goods b on a.goods_id = b.goods_code
         left join user e on e.worker_number = a.worker_id
           ${ex.query}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
         and a.goods_type='P'
         order by a.id desc
     </select>