diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java index 285a7dbb4..91acb4957 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java @@ -93,7 +93,7 @@ public class ActivityPartyDTO implements Serializable { /** * 所有部门ID */ - private String allDeptIds; + private String[] allDeptIds; /** * 所有部门名称 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java index 0a466ebc2..aca589c71 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java @@ -59,6 +59,11 @@ public class ReportPartyDTO implements Serializable { */ private String deptId; + /** + * 是否在市北居住 + */ + private Integer shiBei; + /** * 居住小区名称 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java index cea67d61a..d21b0d4f9 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java @@ -55,6 +55,11 @@ public class ReportPartyEntity extends DeptScope { */ private String deptId; + /** + * 是否在市北居住 + */ + private Integer shiBei; + /** * 居住小区名称 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java index 349c4607c..050ec13bd 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java @@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; @@ -110,6 +112,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -125,11 +132,17 @@ public class FlowPartyServiceImpl extends BaseServiceImpl parentResult = null; + if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -150,4 +163,11 @@ public class FlowPartyServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1])); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -125,4 +132,11 @@ public class IntoPartyServiceImpl extends BaseServiceImpl parentResult = null; + if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -124,11 +132,16 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -149,4 +162,10 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -124,11 +131,16 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -149,4 +161,11 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId()); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -115,11 +122,16 @@ public class ReportPartyServiceImpl extends BaseServiceImpl parentResult = null; if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + } else { + parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId()); } if (!parentResult.success() || parentResult.getData() == null) { throw new RenException("获取部门信息失败"); @@ -140,4 +152,11 @@ public class ReportPartyServiceImpl extends BaseServiceImpl