From aea60a4e652109f3df266e2da1f6abd8d91b4adf Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 5 Nov 2025 17:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/DepartmentAddExe.java | 10 +++++++--- .../basic/info/command/query/DepartmentQueryExe.java | 3 ++- .../com/zcloud/basic/info/dto/DepartmentAddCmd.java | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java index 3b12b6c..70dad23 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentAddExe.java @@ -37,9 +37,13 @@ public class DepartmentAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(DepartmentAddCmd cmd) { DepartmentE examTypeE = new DepartmentE(); - /* if(examTypeE.getParentId()==null){ - examTypeE.setParentId(AuthContext.getTenantId()); - }*/ + //TODO 父id的值待定 +// if(examTypeE.getParentId()==null){ +// examTypeE.setParentId(AuthContext.getTenantId()); +// } + if(cmd.getCorpinfoId() == null){ + cmd.setCorpinfoId(AuthContext.getTenantId()); + } BeanUtils.copyProperties(cmd, examTypeE); Long id = null; try { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 1683d8c..712439a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -60,7 +60,8 @@ public class DepartmentQueryExe { return Collections.emptyList(); } List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); - return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList"); + //GBS部门第一次是1 + return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",1); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java index fc14c81..b2f8bb8 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java @@ -29,7 +29,7 @@ public class DepartmentAddCmd extends Command { @NotEmpty(message = "名称不能为空") private String name; @ApiModelProperty(value = "父部门id", name = "parentId", required = true) - @NotNull(message = "父部门id不能为空") +// @NotNull(message = "父部门id不能为空") private Long parentId; @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true)