zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenbowen
2025-09-28 16:37:38 +08:00
parent aa4c77878a 952fde209a
commit 88e2766b97
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/CompanyDeptInfo.java
View File

@@ -24,4 +24,9 @@ public class CompanyDeptInfo {
* 部门名称 * 部门名称
*/ */
private String deptName; private String deptName;
private String companyCode;
private String deptCode;
} }

6
zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/dept/dto/CompanyDeptInfoRespDTO.java
View File

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

2
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java
View File

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