From cd23dcec04f25d5a11eec2d59f7514a595fc1dec Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 7 Nov 2025 11:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=A0=E9=99=A4=E5=90=8C?= =?UTF-8?q?=E6=AD=A5gbs,=E8=B0=83=E6=95=B4=E9=83=A8=E9=97=A8=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/command/DepartmentAddExe.java | 11 +++++------ .../basic/info/command/DepartmentRemoveExe.java | 2 ++ .../basic/info/command/query/DepartmentQueryExe.java | 2 +- .../basic/info/service/CorpInfoServiceImpl.java | 3 --- .../com/zcloud/basic/info/dto/DepartmentAddCmd.java | 2 +- 5 files changed, 9 insertions(+), 11 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 70dad23..dc2ec62 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 @@ -38,9 +38,9 @@ public class DepartmentAddExe { public boolean execute(DepartmentAddCmd cmd) { DepartmentE examTypeE = new DepartmentE(); //TODO 父id的值待定 -// if(examTypeE.getParentId()==null){ -// examTypeE.setParentId(AuthContext.getTenantId()); -// } + if(cmd.getParentId()==null){ + cmd.setParentId(AuthContext.getTenantId()); + } if(cmd.getCorpinfoId() == null){ cmd.setCorpinfoId(AuthContext.getTenantId()); } @@ -63,9 +63,8 @@ public class DepartmentAddExe { deptCmd.setParentId(examTypeE.getParentId()); deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue()); //TODO gbs部门表 sys_dept tenant_id，parent_ids，add_type_enum，存储错误，导致gbs页面看不到，参数还没有，待定 -// Response response = deptFacade.addDept(deptCmd); -// log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); - + Response response = deptFacade.addDept(deptCmd); + log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); return true; } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java index e8ce870..c0e8a83 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java @@ -65,6 +65,7 @@ public class DepartmentRemoveExe { if (!res) { throw new BizException("删除失败"); } + deptFacade.deleteById( id); //删除redis数据 zcloudRedisUtil.del(Const.REDIS_DEPT_PREFIX+id); return true; @@ -86,6 +87,7 @@ public class DepartmentRemoveExe { } // 批量删除 Redis 缓存 - 循环处理每个ID for (Long id : ids) { + deptFacade.deleteById( id); zcloudRedisUtil.del(Const.REDIS_DEPT_PREFIX + id); } return true; 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 66830ea..8d941ee 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 @@ -67,7 +67,7 @@ public class DepartmentQueryExe { } List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); //GBS部门根节点父部门是1 - return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList"); + return Tools.buildEntityTree(examCenterCOS, "id", "parentId", "childrenList",AuthContext.getTenantId()); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index e8a5163..31406e1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -9,15 +9,12 @@ import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; -import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; import com.zcloud.gbscommon.utils.Tools; -import org.apache.shiro.crypto.hash.SimpleHash; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import java.util.Collection; -import java.util.Collections; import java.util.List; /** 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 ef285cb..f22009f 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")