Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentController.java

@@ -453,4 +453,20 @@
        MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByPid(pid, userId);
        return Result.OK(mdcEquipment);
    }

    /**
     * 根据部门层级查询单个设备
     *
     * @param pid
     * @return
     */
    @AutoLog(value = "设备表-根据部门层级查询单个设备")
    @ApiOperation(value = "设备表-根据部门层级查询单个设备", notes = "设备表-根据部门层级查询单个设备")
    @GetMapping("/getEquipmentByDepPid")
    public Result<MdcEquipment> getEquipmentByDepPid(@RequestParam(name = "pid", required = false) String pid) {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        MdcEquipment mdcEquipment = mdcEquipmentService.getEquipmentByDepPid(pid, userId);
        return Result.OK(mdcEquipment);
    }
}