Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java

@@ -48,6 +48,8 @@ public class ActDetailResultDTO implements Serializable {
      */
     private String parentCode;
 
+    private String menuCode;
+
     /**
      * 活动类别名称；eg：支部建设-三会一课
      */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -469,7 +469,6 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         return list;
     }
 
-
     /**
      * 004、活动详情
      *
@@ -489,6 +488,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             throw new RenException(EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getCode(), EpmetErrorCode.NOT_IN_GROUP_CAN_NOT_VIEW.getMsg());
         }
         ActDetailResultDTO resultDTO=ConvertUtils.sourceToTarget(groupActInfoEntity,ActDetailResultDTO.class);
+        resultDTO.setMenuCode(resultDTO.getCategoryCode().substring(NumConstant.ZERO,NumConstant.THREE));
         resultDTO.setGroupActId(formDTO.getGroupActId());
         resultDTO.setTextList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.TEXT));
         resultDTO.setImgArrayList(groupActContentDao.selectContentList(formDTO.getGroupActId(),GroupActConstant.IMG));
@@ -497,7 +497,6 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             FileDTO fileDTO=new FileDTO();
             fileDTO.setUrl(imgUrl);
             //文件类型(图片 - image、 视频 - video、 语音 - voice、 文档 - doc)
-            fileDTO.setType("image");
             imgList.add(fileDTO);
         });
         resultDTO.setImgList(imgList);