Merge branch 'dev_screen_data_2.0' into dev_temp

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.根据组织级别拼接查询条件，判断查询不同数据表
             //区县级、乡镇街道级

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@@ -94,7 +94,7 @@
             </if>
         </if>
         ORDER BY
-            point_total DESC
+            index_score DESC
         LIMIT #{topNum}
     </select>