Merge remote-tracking branch 'base-version/main' into dev

This commit is contained in:
chenbowen
2025-09-28 16:37:38 +08:00
3 changed files with 13 additions and 0 deletions

View File

@@ -18,10 +18,16 @@ public class CompanyDeptInfoRespDTO {
@Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String companyName;
@Schema(description = "公司编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "xxxx")
private String companyCode;
@Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long deptId;
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
private String deptName;
@Schema(description = "部门编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "xxxxx")
private String deptCode;
}

View File

@@ -383,8 +383,10 @@ public class DeptServiceImpl implements DeptService {
CompanyDeptInfo info = new CompanyDeptInfo();
info.setCompanyId(company.getId());
info.setCompanyName(company.getName());
info.setCompanyCode(company.getCode());
info.setDeptId(dept.getId());
info.setDeptName(dept.getName());
info.setDeptCode(dept.getCode());
result.add(info);
}
return result;