From dfda3c995f31373ea97417b3bfbcef79d7a5af22 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Wed, 5 Nov 2025 16:42:45 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/facade/ZcloudUserFacadeImpl.java | 2 +- .../com/zcloud/basic/info/web/PostController.java | 2 +- .../com/zcloud/basic/info/command/PostAddExe.java | 2 +- .../zcloud/basic/info/command/PostUpdateExe.java | 13 ++++++++++++- .../basic/info/command/query/PostQueryExe.java | 10 ++++++++++ .../zcloud/basic/info/service/PostServiceImpl.java | 3 --- .../java/com/zcloud/basic/info/dto/PostListQry.java | 1 - .../com/zcloud/basic/info/domain/model/PostE.java | 1 - .../basic/info/gatewayimpl/PostGatewayImpl.java | 8 +++++++- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java index f30c2f0..fa28671 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java @@ -24,7 +24,7 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { return MultiResponse.of(objects); } -// @Override + @Override public SingleResponse getInfoByUserId(Long aLong) { return null; } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java index 7635d20..2cab631 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; /** * web-adapter - * + * 岗位管理 * @Author SondonYong * @Date 2025-10-31 17:24:04 */ diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java index 71e4219..8082808 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java @@ -41,7 +41,7 @@ public class PostAddExe { } // 岗位部门关联 - if(res && cmd.getSupervisionFlag() == 1) { + if(res && cmd.getSupervisionFlag() != null && cmd.getSupervisionFlag() == 1) { List postDepartmentEList = postE.addDepartmentIds(postId, cmd.getDepartmentIds()); if(CollUtil.isNotEmpty(postDepartmentEList)){ res = postDepartmentGateway.addList(postDepartmentEList); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java index e9d3dcd..4fbe969 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java @@ -34,13 +34,24 @@ public class PostUpdateExe { boolean res = postGateway.update(postE); // 岗位关联部门 - if(res && postUpdateCmd.getSupervisionFlag() == 1){ + if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){ postDepartmentGateway.deletedPostDepartment(postE.getId()); List postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds()); if(CollUtil.isNotEmpty(postDepartmentEList)){ res = postDepartmentGateway.addList(postDepartmentEList); } + }else { + // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据 + if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 0){ + postDepartmentGateway.deletedPostDepartment(postE.getId()); + } + if(res && postUpdateCmd.getSupervisionFlag() == null){ + postDepartmentGateway.deletedPostDepartment(postE.getId()); + } } + /** + * + */ if (!res) { throw new BizException("修改失败"); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java index bc4a966..36a3475 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java @@ -82,6 +82,11 @@ public class PostQueryExe { return PageResponse.of(postCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + /** + * 查询集合 + * @param qry + * @return + */ public MultiResponse execute(PostListQry qry) { Map params = PageQueryHelper.toHashMap(qry); @@ -132,6 +137,11 @@ public class PostQueryExe { return postCOResponse; } + /** + * 查询单条 + * @param id + * @return + */ public SingleResponse execute(Long id) { SingleResponse postDO = postRepository.getInfoById(id); SingleResponse postCO = new SingleResponse<>(); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java index 2a39859..014590a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java @@ -33,7 +33,6 @@ public class PostServiceImpl implements PostServiceI { @Override public PageResponse listPage(PostPageQry qry) { - return postQueryExe.execute(qry); } @@ -45,13 +44,11 @@ public class PostServiceImpl implements PostServiceI { @Override public SingleResponse getInfoById(Long id) { - return postQueryExe.execute(id); } @Override public SingleResponse add(PostAddCmd cmd) { - postAddExe.execute(cmd); return SingleResponse.buildSuccess(); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java index 8dc43c1..908dcc8 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostListQry.java @@ -1,6 +1,5 @@ package com.zcloud.basic.info.dto; -import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java index 9e3330e..435a8da 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/PostE.java @@ -5,7 +5,6 @@ import com.zcloud.gbscommon.utils.UuidUtil; import lombok.Data; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Objects; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java index 04efcb8..4f89d84 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/PostGatewayImpl.java @@ -13,7 +13,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Arrays; -import java.util.Collections; import java.util.List; /** @@ -44,6 +43,9 @@ public class PostGatewayImpl implements PostGateway { if(StringUtils.isEmpty(d.getPostId())){ d.setPostId(UuidUtil.get32UUID()); } + if(d.getSupervisionFlag() == null){ + d.setSupervisionFlag(0); + } postRepository.save(d); return d.getId(); } @@ -63,6 +65,10 @@ public class PostGatewayImpl implements PostGateway { PostDO d = new PostDO(); BeanUtils.copyProperties(postE, d); + if(d.getSupervisionFlag() == null){ + d.setSupervisionFlag(0); + } + postRepository.updateById(d); return true; }