From 4e1e04e73c1f01af6ec3dc3c7445fb021bc2429f Mon Sep 17 00:00:00 2001 From: YUJT Date: Fri, 29 Apr 2022 10:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9entity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyStandardBearerApplyEntity.java | 23 ++----------------- .../user/service/impl/UserServiceImpl.java | 8 +++---- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java index beffac69b..ec1cca017 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/entity/PartyStandardBearerApplyEntity.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.user.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import com.elink.esua.epdc.commons.mybatis.entity.DeptScope; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +35,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("epdc_party_standard_bearer_apply") -public class PartyStandardBearerApplyEntity extends BaseEpdcEntity { +public class PartyStandardBearerApplyEntity extends DeptScope { private static final long serialVersionUID = 1L; @@ -58,26 +59,6 @@ public class PartyStandardBearerApplyEntity extends BaseEpdcEntity { */ private String deptId; - /** - * 上级机构ID拼接 - */ - private String parentDeptIds; - - /** - * 上级机构名称拼接 - */ - private String parentDeptNames; - - /** - * 全部机构ID拼接 - */ - private String allDeptIds; - - /** - * 全部机构名称拼接 - */ - private String allDeptNames; - /** * 审核人姓名 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java index f01d80662..c217fae96 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java @@ -1831,11 +1831,11 @@ public class UserServiceImpl extends BaseServiceImpl implem UserPartyStandardAppltResultDTO resultDto = baseDao.queryUserPartyApply(userId); PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity(); - entity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); - entity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); entity.setDeptId(gridId); - entity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); - entity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + DeptEntityUtils.loadDeptInfo( + ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class), + entity + ); entity.setUserId(resultDto.getId()); entity.setRealName(resultDto.getRealName());