From b5efa87f30a488ea3a4a65844cc22eb14fb916a3 Mon Sep 17 00:00:00 2001 From: zhaolei Date: Wed, 10 Jun 2026 08:59:33 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3-=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E8=B5=84=E6=BA=90=E9=83=A8=E9=97=A8=E4=BF=9D?= =?UTF-8?q?=E5=AD=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4fc90fa6531e3cc0175ced9eb33952cc2db78503. --- .../facade/ZcloudDepartmentFacadeImpl.java | 8 ------- .../basic/info/command/DepartmentAddExe.java | 23 ------------------- .../info/service/DepartmentServiceImpl.java | 5 ---- .../basic/info/api/DepartmentServiceI.java | 2 -- 4 files changed, 38 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java index 1a03267a..f9c32b0d 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java @@ -100,12 +100,4 @@ public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade { } return map; } - - @Override - public SingleResponse addHumanUserDept(ZcloudDepartmentAddCmd zcloudDepartmentAddCmd) { - DepartmentAddCmd addCmd = new DepartmentAddCmd(); - BeanUtils.copyProperties(zcloudDepartmentAddCmd, addCmd); - Long deptId = departmentService.addHumanUserDept(addCmd); - return SingleResponse.of(deptId); - } } 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 bf3b1a3d..563e150e 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 @@ -16,7 +16,6 @@ import com.zcloud.basic.info.dto.DepartmentAddCmd; import com.zcloud.basic.info.dto.DepartmentTreeQry; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; -import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -74,27 +73,5 @@ public class DepartmentAddExe { } return id; } - - @Transactional(rollbackFor = Exception.class) - public Long executeHumanUserDept(DepartmentAddCmd cmd) { - DepartmentE examTypeE = new DepartmentE(); - BeanUtils.copyProperties(cmd, examTypeE); - cmd.setDepartmentId(Tools.get32UUID()); - Long id = null; - try { - id = departmentGateway.add(examTypeE); - } catch (Exception e) { - throw new RuntimeException(e); - } - - if (id ==null) { - throw new BizException("保存失败"); - } - if(CollUtil.isNotEmpty(cmd.getDepartmentIdsList())&& CommonFlagEnum.YES.getCode().equals(cmd.getSuperviseFlag())){ - List departmentSuperviseEList =examTypeE.initAdd(cmd.getDepartmentIdsList(), id); - departmentSuperviseGateway.addbatch(departmentSuperviseEList); - } - return id; - } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index 14525691..ebb6a3a0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -101,10 +101,5 @@ public class DepartmentServiceImpl implements DepartmentServiceI { String name = Tools.getTreeFullName(list,"id", "parentId", "name", deptId); return name; } - - @Override - public Long addHumanUserDept(DepartmentAddCmd cmd) { - return departmentAddExe.executeHumanUserDept(cmd); - } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index 634bc77f..a03e74ee 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -44,7 +44,5 @@ public interface DepartmentServiceI { Collection listAllTreeByCorpType(DepartmentTreeQry qry); - - Long addHumanUserDept(DepartmentAddCmd cmd); }