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

mall-server-api/src/main/java/com/gree/mall/manager/controller/StorageController.java

@@ -56,12 +56,13 @@ public class StorageController {
     @GetMapping("/list")
     @ApiOperation(value = "仓储列表")
     public ResponseHelper<Page<Storage>> page(
-            @ApiParam(value = "属性",required = false) @RequestParam(required = false) String type,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "属性", required = false) @RequestParam(required = false) String type,
+            @ApiParam(value = "状态") @RequestParam(required = false) Boolean status,
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<Storage> page = storageLogic.page(type,pageNum, pageSize,request);
+        IPage<Storage> page = storageLogic.page(type, status, pageNum, pageSize, request);
         return ResponseHelper.success(page);
     }
 

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

@@ -38,16 +38,19 @@ public class StorageLogic {
     /**
      * 仓储列表
      *
+     * @param type
+     * @param status
      * @param pageNum
      * @param pageSize
      * @return
      */
-    public IPage<Storage> page(String type,Integer pageNum, Integer pageSize,HttpServletRequest request) {
+    public IPage<Storage> page(String type, Boolean status, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         return storageService.lambdaQuery()
-                .like(!StringUtils.isEmpty(type),Storage::getType,type)
-                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),Storage::getCompanyWechatId,adminUser.getCompanyWechatIds())
+                .like(!StringUtils.isEmpty(type), Storage::getType, type)
+                .eq(Objects.nonNull(status), Storage::getStatus, status)
+                .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), Storage::getCompanyWechatId, adminUser.getCompanyWechatIds())
                 .page(new Page<>(pageNum, pageSize));
     }