no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonPageV2Mapper.java

@@ -27,8 +27,7 @@ public interface CommonPageV2Mapper {
 
     @SqlParser(filter = true)
     IPage<StorageVO> pageV2Storage(Page page, @Param("ex") ZfireParamBean zfireParam,
-                                   @Param("companyWechatIds") List<String> companyWechatIds,
-                                   @Param("websitIds") List<String> websitIds);
+                                   @Param("companyWechatIds") List<String> companyWechatIds);
 
     @SqlParser(filter = true)
     IPage<CommonTemplateVO> pageV2Template(Page page,@Param("ex")  ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);

mall-server-api/src/main/java/com/gree/mall/manager/logic/StorageLogic.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.StorageVO;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.commonmapper.CommonPageV2Mapper;
-import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.Storage;
@@ -171,15 +170,10 @@ public class StorageLogic {
 
 
         //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, StorageVO.class);
-
-        List<String> adminWebsitIds = null;
-        if (Objects.nonNull(adminUser.getAdminWebsit()) && adminUser.getAdminWebsit().getType().equals(AdminWebsitTypeEnum.C.getKey())) {
-            adminWebsitIds = adminUser.getAdminWebsitIds();
-        }
+        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, StorageVO.class, adminUser);
 
         IPage<StorageVO> storageVOIPage = commonPageV2Mapper.pageV2Storage(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
-                zfireParam, companyWechatIds, adminWebsitIds);
+                zfireParam, companyWechatIds);
 
         return storageVOIPage;
     }

mall-server-api/src/main/resources/mapper/CommonPageMapper.xml

@@ -37,9 +37,9 @@
 
 
         </if>
-        <if test="websitIds != null and websitIds.size > 0">
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
-            <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>