fix: remove broken duplicate page return

zhou zhou

2 天以前 f27309d45c7ef46b0aea98107b67d0c5b46d4217

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java

@@ -13,6 +13,7 @@
import com.vincent.rsf.server.manager.entity.ViewStockManage;
import com.vincent.rsf.server.manager.enums.ViewStockType;
import com.vincent.rsf.server.manager.service.WarehouseStockService;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
@@ -59,17 +60,22 @@
        } else {
            wrapper.groupBy("matnr_id");
        }
        wrapper.eq(!Objects.isNull(param.get("matnrCode")), "matnr_code", param.get("matnrCode"));

        FieldsUtils.setFieldsFilters(wrapper, pageParam, ViewStockManage.class);


        IPage<ViewStockManage> pageResult = warehouseStockService.pageByStock(pageParam, wrapper);


        List<ViewStockManage> records = pageResult.getRecords();
        for (ViewStockManage record : records) {

        records.forEach(record -> {
            if (!Objects.isNull(record.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
                record.setExtendFields(fields);
            }
        }
        });
        pageResult.setRecords(records);

        return R.ok(pageResult);
@@ -111,6 +117,7 @@
        }
        pageResult.setRecords(records);

        buildPageRowsUtils.userNameMap(pageResult.getRecords());
        return R.ok(pageResult);
    }

@@ -145,8 +152,17 @@
        } else {
            wrapper.eq(ViewStockManage::getMatnrCode, stock.getMatnrCode());
       }
        PageParam<ViewStockManage, BaseParam> result = warehouseStockService.page(pageParam, wrapper);
        List<ViewStockManage> records = result.getRecords();
        records.forEach(record -> {
            if (!Objects.isNull(record.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
                record.setExtendFields(fields);
            }
        });
        result.setRecords(records);

        return R.ok(warehouseStockService.page(pageParam, wrapper));
        return R.ok(result);
    }

}