From da84291f31deb49eaa9f46fb204dcde95fb31908 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Wed, 5 Nov 2025 10:25:56 +0800 Subject: [PATCH 1/4] =?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 --- .../java/com/zcloud/basic/info/web/PostController.java | 2 -- .../java/com/zcloud/basic/info/command/PostRemoveExe.java | 5 ++--- .../main/java/com/zcloud/basic/info/dto/PostListQry.java | 2 +- .../main/java/com/zcloud/basic/info/dto/PostPageQry.java | 8 ++++---- 4 files changed, 7 insertions(+), 10 deletions(-) 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 3f270aa..7635d20 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 @@ -9,7 +9,6 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,7 +16,6 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; /** * web-adapter diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java index 2341637..370051c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway; import com.zcloud.basic.info.domain.gateway.PostGateway; import com.alibaba.cola.exception.BizException; -import com.zcloud.basic.info.domain.gateway.UserGateway; import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.repository.UserRepository; import lombok.AllArgsConstructor; @@ -29,7 +28,7 @@ public class PostRemoveExe { @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { - // 校验是否有人员使用该岗位 + // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("post_id", id); queryWrapper.eq("delete_enum", "FALSE"); @@ -53,7 +52,7 @@ public class PostRemoveExe { throw new BizException("岗位ID不能为空"); } - // 校验是否有人员使用该岗位 + // 这段代码后续放到user的方法中, 校验是否有人员使用该岗位 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("post_id", ids); queryWrapper.eq("delete_enum", "FALSE"); 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 b11bad0..8dc43c1 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 @@ -41,7 +41,7 @@ public class PostListQry { // 部门id private Long departmentId; - @ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true) + @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) // 企业id private Long corpinfoId; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java index 8a41cbf..c3b1e0a 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java @@ -27,21 +27,21 @@ public class PostPageQry extends PageQuery { * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "departmentId", required = true) + @ApiModelProperty(value = "监管端/企业端标识,1-监管端, 2-企业端", name = "corpFlag", required = true) @NotNull(message = "监管端/企业端标识不能为空") // 监管端/企业端标识,1-监管端, 2-企业端 private Integer corpFlag; - @ApiModelProperty(value = "部门id", name = "departmentId", required = true) + @ApiModelProperty(value = "部门id", name = "eqDepartmentId", required = true) @NotNull(message = "部门id不能为空") // 部门id private Long eqDepartmentId; - @ApiModelProperty(value = "企业id", name = "departmentId") + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId") // 企业id private Long eqCorpinfoId; - @ApiModelProperty(value = "岗位名称", name = "departmentId") + @ApiModelProperty(value = "岗位名称", name = "likePostName") // 岗位名称 private String likePostName; From fd11ffe72effa487b10523dcbcc7f7486354055f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 5 Nov 2025 11:35:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=92=8C=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 --- .../basic/info/command/CorpInfoAddExe.java | 30 ++++++++++++++++++- .../basic/info/command/DepartmentAddExe.java | 15 +++++----- .../impl/DepartmentRepositoryImpl.java | 2 -- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java index 355da97..4b94de9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java @@ -1,10 +1,16 @@ package com.zcloud.basic.info.command; +import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.system.client.tenant.facade.TenantFacade; +import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd; +import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.gateway.CorpInfoGateway; import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.dto.CorpInfoAddCmd; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -18,14 +24,36 @@ import org.springframework.transaction.annotation.Transactional; */ @Component @AllArgsConstructor +@Slf4j public class CorpInfoAddExe { private final CorpInfoGateway corpInfoGateway; + @DubboReference + private TenantFacade tenantFacade; @Transactional(rollbackFor = Exception.class) public Long execute(CorpInfoAddCmd cmd) { CorpInfoE examTypeE = new CorpInfoE(); BeanUtils.copyProperties(cmd, examTypeE); - return corpInfoGateway.add(examTypeE); + + Long corpInfoId ; + try { + corpInfoId = corpInfoGateway.add(examTypeE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (corpInfoId == null) { + throw new BizException("保存失败"); + } + OtaTenantAddCmd otaTenantAddCmd = new OtaTenantAddCmd(); + otaTenantAddCmd.setAccount(examTypeE.getCorpName()); + otaTenantAddCmd.setTenantId(corpInfoId); + otaTenantAddCmd.setTenantName(examTypeE.getCorpName()); + otaTenantAddCmd.setPassword("Aa@123456789"); + log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString()); + //TODO 企业推送gbs报错解密失败 + // Response response = tenantFacade.addOtaTenant(otaTenantAddCmd); + //log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString()); + return corpInfoId; } } 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 52aaa67..3b12b6c 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 @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command; import com.alibaba.cola.dto.Response; import com.alibaba.cola.exception.BizException; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.system.client.dept.facade.DeptFacade; import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd; import com.jjb.saas.system.client.user.facade.UserFacade; @@ -36,12 +37,10 @@ public class DepartmentAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(DepartmentAddCmd cmd) { DepartmentE examTypeE = new DepartmentE(); + /* if(examTypeE.getParentId()==null){ + examTypeE.setParentId(AuthContext.getTenantId()); + }*/ BeanUtils.copyProperties(cmd, examTypeE); - - //a -// userFacade.addUser(new FacadeUserAddCmd()); -// C = examTypeE.add(a,b,c); - Long id = null; try { id = departmentGateway.add(examTypeE); @@ -56,10 +55,12 @@ public class DepartmentAddExe { FacadeAddDeptCmd deptCmd = new FacadeAddDeptCmd(); deptCmd.setLinkId(id); deptCmd.setLinkName(examTypeE.getName()); + deptCmd.setParentId(examTypeE.getParentId()); deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue()); - Response response = deptFacade.addDept(deptCmd); - log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); + //TODO gbs部门表 sys_dept tenant_id，parent_ids，add_type_enum，存储错误，导致gbs页面看不到，参数还没有，待定 +// Response response = deptFacade.addDept(deptCmd); +// log.info("DepartmentAddExe,新增部门调用GBS返回："+response.toString()); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index fc659a0..37c203b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -45,8 +45,6 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listTree(Map parmas) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); -// SSOUser ssoUser = AuthContext.getCurrentUser(); -// queryWrapper.eq("tenant_id",ssoUser.getTenantId()); queryWrapper.orderByDesc("dep_order"); List departmentDOList = departmentMapper.selectList(queryWrapper); if (CollUtil.isEmpty(departmentDOList)) { From 6f282679f8ef8d26d111db78b8d104d51565641e Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 5 Nov 2025 16:41:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=92=8C=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 --- .../java/com/zcloud/basic/info/web/DepartmentController.java | 1 - .../main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java | 2 ++ .../main/java/com/zcloud/basic/info/dto/DepartmentAddCmd.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 5fd10c6..a48f0ff 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -44,7 +44,6 @@ public class DepartmentController { @ApiOperation("新增部门") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody DepartmentAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return departmentService.add(cmd); } 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 6c54a20..ff9d342 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 @@ -29,6 +29,7 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId", required = true) private String corpinfoId; @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + @NotEmpty(message = "企业名称不能为空") private String corpName; @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)", name = "type", required = true) private Integer type; @@ -39,6 +40,7 @@ public class CorpInfoAddCmd extends Command { @ApiModelProperty(value = "是否启用，1:启用,0:关闭", name = "useFlag", required = true) private Integer useFlag; @ApiModelProperty(value = "统一社会信用代码", name = "code", required = true) + @NotEmpty(message = "统一社会信用代码不能为空") private String code; @ApiModelProperty(value = "通讯地址", name = "address", required = true) private String address; 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 0148d92..fc14c81 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 @@ -35,10 +35,13 @@ public class DepartmentAddCmd extends Command { @ApiModelProperty(value = "所属企业", name = "corpinfoId", required = true) private Long corpinfoId; @ApiModelProperty(value = "部门级别编码", name = "level", required = true) + @NotEmpty(message = "部门级别编码不能为空") private String level; @ApiModelProperty(value = "部门级别名称,汉字30以内", name = "levelName", required = true) + @NotEmpty(message = "部门级别名称不能为空") private String levelName; @ApiModelProperty(value = "部门排序", name = "depOrder", required = true) + @NotNull(message = "部门排序不能为空") private Integer depOrder; @ApiModelProperty(value = "是否监管部门 0-否 1-是", name = "superviseFlag", required = true) private Integer superviseFlag; From dfda3c995f31373ea97417b3bfbcef79d7a5af22 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Wed, 5 Nov 2025 16:42:45 +0800 Subject: [PATCH 4/4] =?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; }