Merge branch 'dev_bug_sb_syc' into shibei_master

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java

@@ -112,6 +112,7 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
      * @author sun
      */
     List<ProjectCategoryResultDTO> getProjectCategoryList(@Param("customerId") String customerId,
+                                                          @Param("categoryCodeList") List<String> categoryCodeList,
                                                           @Param("secondCodeList") List<String> secondCodeList,
                                                           @Param("userIds") List<String> userIds,
                                                           @Param("origin") String origin);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -683,10 +683,10 @@ public class GovProjectServiceImpl implements GovProjectService {
 		})).collect(Collectors.toList());
 
 		//4.根据userId集合和二级分类Code集合查询来源楼院小组的项目
-		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue");
+		List<ProjectCategoryResultDTO> groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue");
 
 		//5.根据userId集合和二级分类Code集合查询来源事件上报的项目
-		List<ProjectCategoryResultDTO> eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent");
+		List<ProjectCategoryResultDTO> eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), secondCodeList, userIds, "resiEvent");
 
 		//6.封装数据
 		//楼院小组下分类项目列表

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -377,7 +377,7 @@
                 </foreach>
             </when>
             <otherwise>
-                <foreach collection="secondCodeList" item="code" open="AND (" separator=" OR "  close=" )" >
+                <foreach collection="categoryCodeList" item="code" open="AND (" separator=" OR "  close=" )" >
                     pc.category_code LIKE CONCAT(#{code}, '%')
                 </foreach>
             </otherwise>