From 6012f02dde8bf1461d0d1d0d5bf7b08f6a61956a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 22 四月 2024 17:02:49 +0800
Subject: [PATCH] 修改参数
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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..8812d22 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,16 +1140,10 @@
* 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<Map<String, Object>> list = calibrationOrderService.getAreaEquipmentList(equipmentNum,"",null);
return Result.ok(list);
}
--
Gitblit v1.9.3