From a6bbdb3398a2b855c78586f08c0ad750c8968433 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 2 Mar 2026 13:58:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(corp):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A,=E9=83=A8=E9=97=A8=E6=96=B0=E5=A2=9E=E9=9B=AA?= =?UTF-8?q?=E8=8A=B1id=E4=BC=A0=E5=85=A5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/basic/info/web/CorpInfoXgfController.java | 2 +- .../main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java | 2 ++ .../java/com/zcloud/basic/info/dto/DepartmentAddCmd.java | 3 ++- .../zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java | 5 +++++ .../persistence/repository/impl/CorpInfoRepositoryImpl.java | 3 +++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java index 447da05d..ebfc0f80 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoXgfController.java @@ -26,7 +26,7 @@ import java.util.ArrayList; * @Author zhaokai * @Date 2025-10-31 10:52:09 */ -@Api(tags = "企业相关方信息") +@Api(tags = "企业相关方信息-废弃") @RequestMapping("/${application.gateway}/corpInfoXgf") @RestController @AllArgsConstructor diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java index 19361c25..450e7422 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java @@ -26,6 +26,8 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class CorpInfoAddCmd extends Command { + @ApiModelProperty(value = "雪花id", name = "id") + private Long id; @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) private String corpinfoId; 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 645c2b66..2a97c70b 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 @@ -22,7 +22,8 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class DepartmentAddCmd extends Command { - + @ApiModelProperty(value = "雪花id", name = "id") + private Long id; @ApiModelProperty(value = "部门id", name = "departmentId", required = true) private String departmentId; @ApiModelProperty(value = "名称,汉字30以内", name = "name", required = true) diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java index 8e0dd497..040d12c2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/DepartmentGatewayImpl.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.gatewayimpl; +import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; @@ -57,8 +58,12 @@ public class DepartmentGatewayImpl implements DepartmentGateway { deptCmd.setDeptName(departmentE.getName()); deptCmd.setParentIds(deptDetailCO.getData().getParentIds()); deptCmd.setAddTypeEnum("MANUAL"); + if(departmentE.getId()!=null){ + deptCmd.setId(departmentE.getId()); + } //TODO gbs部门表 sys_dept tenant_id，parent_ids，add_type_enum，存储错误，导致gbs页面看不到，参数还没有，待定 // TODO gbs的这个创建部门接口没有区分企业, 新建的企业创建其他企业有的部门名称时报错:名称已存在 + log.info("DepartmentAddExe,新增部门调用GBS请求："+ JSONUtil.toJsonStr(deptCmd)); SingleResponse response = deptFacade.add(deptCmd); d.setId(response.getData()); departmentRepository.save(d); diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 1930bd11..91c6cc7d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -165,6 +165,9 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl corpId = unitFacade.add(ouac);