参数修改

qushaowei

2024-04-22 d658f756f3e78f498791a594103cd99622288607

 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);
    }