Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

 screen-manage/src/main/java/com/moral/api/controller/VersionController.java

@@ -108,9 +108,26 @@


    @GetMapping("queryById")
    public ResultMessage queryById(Integer id){
        VersionDTO dto = versionService.queryVersionById(id);
        VersionVO vo = VersionVO.convert(dto);
    public ResultMessage queryById(VersionQueryByIdForm form){
        //判断是否缺少参数
        if (!form.valid())
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());

        VersionQueryDTO dto = versionService.queryVersionById(form);

        VersionQueryVO vo = VersionQueryVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }

    @GetMapping("queryByOrgId")
    public ResultMessage queryByOrganizationId(Integer organizationId){

        VersionQueryDTO dto = versionService.queryByOrganizationId(organizationId);

        VersionQueryVO vo = VersionQueryVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
    }