From 46dfa0658e4477e404e9d4502fbcacb45aba7092 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 29 Sep 2020 16:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=86=8D=E6=8A=9B=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=20=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/fact/impl/FactIndexServiceImpl.java | 15 ++++++++++----- .../mapper/screen/ScreenPartyUserRankDataDao.xml | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java index d9d62734c0..d4ecce03b4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java @@ -71,7 +71,8 @@ public class FactIndexServiceImpl implements FactIndexService { //3.根据组织Id查询组织信息 CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId()); if (null == agency) { - throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + return resultList; } //4.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 @@ -171,7 +172,8 @@ public class FactIndexServiceImpl implements FactIndexService { //2.根据组织Id查询组织信息 CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId()); if (null == agency) { - throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + return resultList; } //3.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 @@ -217,7 +219,8 @@ public class FactIndexServiceImpl implements FactIndexService { //3.根据组织Id查询组织信息 CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId()); if (null == agency) { - throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + return resultList; } //4.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 @@ -286,7 +289,8 @@ public class FactIndexServiceImpl implements FactIndexService { //2.根据组织Id查询组织信息 CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId()); if (null == agency) { - throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId())); + return resultList; } //3.根据组织级别拼接查询条件，判断查询不同数据表 //区县级、乡镇街道级 @@ -352,7 +356,8 @@ public class FactIndexServiceImpl implements FactIndexService { //3.根据组织Id查询组织信息 CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId()); if (null == agency) { - throw new RenException(String.format("查询到组织信息失败,组织Id:%s", formDTO.getOrgId())); + //throw new RenException(String.format("查询组织信息失败,组织Id:%s", formDTO.getOrgId())); + return resultList; } //4.根据组织级别拼接查询条件，判断查询不同数据表 //区县级、乡镇街道级 diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index b1c3cccd70..c06feea2e6 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -94,7 +94,7 @@ ORDER BY - point_total DESC + index_score DESC LIMIT #{topNum}