From a862e80c1ee46a77fc8a2dacf59b0110b3669550 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 22 四月 2024 16:32:02 +0800
Subject: [PATCH] 参数修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 4cc58dc..ca175e5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -1140,15 +1140,12 @@
* qsw 2024-4-22
*/
@GetMapping("getAreaEquipmentList")
- public Result<?> getAreaEquipmentList(String productionCode,String equipmentNum) {
+ public Result<?> getAreaEquipmentList(String equipmentNum) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Integer userType = user.getUserType();
List<Map<String, Object>> list = null;
if(!USER_TYPE_1.equals(userType)){
- Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- if(area != null){
- list = calibrationOrderService.getAreaEquipmentList(equipmentNum,area.getId(),null);
- }
+ list = calibrationOrderService.getAreaEquipmentList(equipmentNum,"",null);
}
return Result.ok(list);
}
--
Gitblit v1.9.3