diff --git a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java index 713fd84a..47a62f1e 100644 --- a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java +++ b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java @@ -24,4 +24,9 @@ public class CompanyDeptInfo { * 部门名称 */ private String deptName; + + private String companyCode; + + private String deptCode; + } \ No newline at end of file diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java index 4044a6ae..d78dc98f 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java @@ -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; + } \ No newline at end of file diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java index 1c0d9341..148dc3e1 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java @@ -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;