Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/ResiTopicDao.xml

@@ -39,5 +39,6 @@
             <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
                 rt.CREATED_BY = #{epmetUserId}
             </foreach>
+            order by rt.CREATED_TIME desc
     </select>
 </mapper>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ResiEventResearchAnalysisFormDTO.java

@@ -34,7 +34,7 @@ public class ResiEventResearchAnalysisFormDTO implements Serializable {
     /**
      * 个人档案的这个人
      */
-    @NotBlank(message = "isResiUserId不能为空",groups = AddUserInternalGroup.class)
+    @NotBlank(message = "icResiUserId不能为空",groups = AddUserInternalGroup.class)
     private String icResiUserId;
 
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -689,7 +689,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     public ResiEventResearchAnalysisResDTO queryResiEventResearchAnalysis(ResiEventResearchAnalysisFormDTO formDTO) {
         //获取案件居民和及家属列表
         Result<IcResiUserBriefDTO> userRes = epmetUserOpenFeignClient.findFamilyMem(formDTO.getIcResiUserId());
-        if (userRes.success() || null == userRes.getData()) {
+        if (!userRes.success() || null == userRes.getData()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息接口异常");
         }
         IcResiUserBriefDTO icResiUserDTO = userRes.getData();
@@ -715,6 +715,11 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
                     firstCategoryIds.add(categoryDTO.getCategoryId());
                     continue;
                 }
+                //当前分类为二级分类
+                if(!categoryDTO.getCategoryPids().contains(StrConstant.COMMA)&&categoryDTO.getCategoryPids().contains(StrConstant.COLON)){
+                    firstCategoryIds.add(categoryDTO.getCategoryPids());
+                    continue;
+                }
                 //英文逗号
                 if(categoryDTO.getCategoryPids().contains(StrConstant.COMMA)){
                     String[] categoryAtt=categoryDTO.getCategoryPids().split(StrConstant.COMMA);
@@ -733,6 +738,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if(CollectionUtils.isEmpty(firstCategoryIds)){
             return resultDTO;
         }
+        log.info(String.format("当前项目id:%s,所有一级分类id:%s",formDTO.getProjectId(), JSON.toJSONString(firstCategoryIds)));
         //查询这些分类的名称
         //查询出当前人，在居民端小程序里上报的需求且转了项目的，并且还得排除当前的这个项目
         IssueProjectCategoryDictListFormDTO dictFormDto=new IssueProjectCategoryDictListFormDTO();