Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -48,10 +48,7 @@
        //处理插入业务
        OrganizationDTO dto = organizationService.insertOrganization(form);

        //转换前端需要的参数
        OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);

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

    @PostMapping("update")
@@ -71,10 +68,7 @@
        //处理更新业务
        OrganizationDTO dto = organizationService.updateOrganization(form);

        //转换前端需要的参数
        OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);

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

    @PostMapping("delete")
@@ -87,10 +81,7 @@
        //处理删除业务
        OrganizationDTO dto = organizationService.deleteOrganization(form);

        //转换前端需要的参数
        OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);

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

    @GetMapping("query")