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

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

@@ -65,7 +65,7 @@ public class WorkerStockLogic {
         final AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.materialParam(zfireParamBean, WorkerStockVO.class, adminUser);
         List<String> workers = null;
-        if (CollectionUtil.isNotEmpty(zfireParamBean.getAdminWebsitIds())) {
+        if (adminUser.getType() == 0 && CollectionUtil.isNotEmpty(zfireParamBean.getAdminWebsitIds())) {
             List<WebsitUser> workerList = websitUserService.lambdaQuery()
                     .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()), WebsitUser::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .in(WebsitUser::getWebsitId, zfireParamBean.getAdminWebsitIds())