From ba1ebf33c31ad86c8650eac7014996a8cc0f20f4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 24 三月 2026 09:20:57 +0800
Subject: [PATCH] fix: 去除if空语句
---
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index 82acc3e..d94b452 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -1,5 +1,8 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -45,15 +48,15 @@
@GetMapping("/list")
@ApiOperation("鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎")
@Log(title = "鐗╂枡鏁版嵁绫诲埆鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- public AjaxResult productMaterialList() {
- List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList();
+ public AjaxResult productMaterialList(@RequestParam("type") Integer type) {
+ List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(type);
return AjaxResult.success(productMaterialMap);
}
@GetMapping("/listQuery")
@ApiOperation("鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎")
@Log(title = "鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- public AjaxResult productMaterialListByQuery(@RequestParam(value = "materialName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
+ public AjaxResult productMaterialListByQuery(@RequestParam(value = "productName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.productMaterialListByQuery(materialName, materialTypeId);
return AjaxResult.success(productMaterialMap);
}
--
Gitblit v1.9.3