From 620a92d24c4448e2b439dc6183839db817b46b28 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Fri, 29 Nov 2019 10:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E2=80=9C=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E2=80=9D=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcAppUserController.java | 1 - .../PartyAuthenticationFailedEntity.java | 40 +++++++++---------- .../esua/epdc/entity/PartyMembersEntity.java | 34 ++++++++-------- .../service/impl/PartyMembersServiceImpl.java | 2 - .../epdc/service/impl/UserServiceImpl.java | 10 +++-- 5 files changed, 44 insertions(+), 43 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 9976e509e..3084a59de 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** * 对移动端开放 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java index 862d20235..d5d2e15ed 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java @@ -78,26 +78,6 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity { */ private Date registTime; - /** - * 街道名称 - */ - private String streetName; - - /** - * 街道ID - */ - private Long streetId; - - /** - * 社区名称 - */ - private String communityName; - - /** - * 社区ID - */ - private Long communityId; - /** * 网格名称 */ @@ -133,4 +113,24 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity { */ private String address; + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + + /*** + *父所有部门 + */ + private String parentDeptIds; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java index 3eb40dd29..d4828519a 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java @@ -73,22 +73,6 @@ public class PartyMembersEntity extends BaseEpdcEntity { * 注册时间 */ private Date registTime; - /** - * 街道名称 - */ - private String streetName; - /** - * 街道ID - */ - private long streetId; - /** - * 社区名称 - */ - private String communityName; - /** - * 社区ID - */ - private long communityId; /** * 网格名称 */ @@ -101,5 +85,23 @@ public class PartyMembersEntity extends BaseEpdcEntity { * 部门ID */ private long deptId; + /*** + *所有部门名称 + */ + private String allDeptNames; + + /*** + *所有部门ID + */ + private String allDeptIds; + + /*** + *父所有部门 + */ + private String parentDeptNames; + /*** + *父所有部门 + */ + private String parentDeptIds; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index bafb55126..5e8dc6044 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -162,8 +162,6 @@ public class PartyMembersServiceImpl extends BaseServiceImpl implem String identityNo = userDto.getIdentityNo(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); - partyMembersEntity.setStreetId(userGridRelation.getStreetId()); - partyMembersEntity.setStreetName(userGridRelation.getStreet()); - partyMembersEntity.setCommunityId(userGridRelation.getCommunityId()); - partyMembersEntity.setCommunityName(userGridRelation.getCommunity()); + //修改数据库结构 + partyMembersEntity.setAllDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()+"-"+userGridRelation.getGrid()); + partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()+","+userGridRelation.getGridId()); + partyMembersEntity.setParentDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()); + partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()); + partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value());