修改entity

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;
-
     /**
      * 审核人姓名
      */

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<UserDao, UserEntity> 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());