Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java

@@ -454,6 +454,11 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
                 List<ScreenProjectCategoryOrgDailyEntity> falseList = groupByStatus.get(false);
                 if (!CollectionUtils.isEmpty(falseList)){
                     result.addAll(falseList);
+                    result.forEach(r -> {
+                        r.setCustomerId(customerId);
+                        r.setOrgId(entity.getAgencyId());
+                        r.setPid(entity.getPid());
+                    });
                 }
                 // 添加此 锦水、孔村、榆山 orgId，删除时使用
                 orgIds.add(PingYinConstant.JIN_SHUI_AGENCY_ID);

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -79,9 +79,10 @@
     <!-- 查询内部客户组织的项目分类 -->
     <select id="selectSelfAgencyCategory" resultType="com.epmet.dto.screen.result.CategoryProjectResultDTO">
         SELECT
-            od.pid AS orgId,
+            IF(od.pid = '0', od.ORG_ID,od.pid) AS orgId,
             IFNULL(sca.PID,'0') AS pid,
             IFNULL(sca.PIDS,'0') AS pids,
+            od.CUSTOMER_ID,
             od.level,
             od.CATEGORY_CODE,
             IFNULL(SUM(od.PROJECT_TOTAL),0) AS projectTotal,