Commit 28b3563d by 吴博

fixbug:[none] fixclassify

parent 9d7e73a2
...@@ -5495,7 +5495,7 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -5495,7 +5495,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
if (null != adviserDto) { if (null != adviserDto) {
// 新增判断是否K12分类 // 新增判断是否K12分类
if (Objects.nonNull(adviserDto.getTempletId())) { if (Objects.nonNull(adviserDto.getTempletId())) {
if (CollUtil.toList(RightsSettingConstant.K12_TEMPLATE_IDS).contains(adviserDto.getTempletId())) { if (CollUtil.toList(RightsSettingConstant.K12_TEMPLET_ID_NEW).contains(adviserDto.getTempletId())) {
map.put("isK12", Boolean.TRUE); map.put("isK12", Boolean.TRUE);
} }
} }
......
...@@ -1628,7 +1628,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz { ...@@ -1628,7 +1628,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
Map<Long, GroupActivity4AppletDTO> appletDTOMap = new HashMap<>(); Map<Long, GroupActivity4AppletDTO> appletDTOMap = new HashMap<>();
if (ActivityGroupTypeEnum.THIRD_GROUP.value.equals(groupType)) { if (ActivityGroupTypeEnum.THIRD_GROUP.value.equals(groupType)) {
//第三方群 //第三方群
appletDTOMap = pcloudGroupActivityDao.getThridPartByIds(groupIds); appletDTOMap = pcloudGroupActivityDao.getThirdPartByIds(groupIds);
} else { } else {
//群分类 //群分类
appletDTOMap = pcloudGroupActivityDao.getGroupClassifyByIds(groupIds); appletDTOMap = pcloudGroupActivityDao.getGroupClassifyByIds(groupIds);
......
...@@ -2234,7 +2234,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz { ...@@ -2234,7 +2234,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
rightsSettingDto.setSecondClassifyContent(classifyMap.get(rightsSettingDto.getSecondClassify()).getTempletName()); rightsSettingDto.setSecondClassifyContent(classifyMap.get(rightsSettingDto.getSecondClassify()).getTempletName());
} }
if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(rightsSettingDto.getThirdClassify())) { if (!MapUtils.isEmpty(classifyMap) && classifyMap.containsKey(rightsSettingDto.getThirdClassify())) {
rightsSettingDto.setThridClassifyContent(classifyMap.get(rightsSettingDto.getThirdClassify()).getTempletName()); rightsSettingDto.setThirdClassifyContent(classifyMap.get(rightsSettingDto.getThirdClassify()).getTempletName());
} }
if (!MapUtils.isEmpty(bookLabelMap) && bookLabelMap.containsKey(rightsSettingDto.getGradeLabelId())) { if (!MapUtils.isEmpty(bookLabelMap) && bookLabelMap.containsKey(rightsSettingDto.getGradeLabelId())) {
rightsSettingDto.setGradeLabelIdContent(bookLabelMap.get(rightsSettingDto.getGradeLabelId()).getName()); rightsSettingDto.setGradeLabelIdContent(bookLabelMap.get(rightsSettingDto.getGradeLabelId()).getName());
......
...@@ -212,7 +212,7 @@ public class RightsSetting extends BaseTempletClassify { ...@@ -212,7 +212,7 @@ public class RightsSetting extends BaseTempletClassify {
private String secondClassifyContent; private String secondClassifyContent;
private String thridClassifyContent; private String thirdClassifyContent;
private String gradeLabelIdContent; private String gradeLabelIdContent;
......
...@@ -35,7 +35,7 @@ public interface PcloudGroupActivityDao extends BaseDao<PcloudGroupActivity> { ...@@ -35,7 +35,7 @@ public interface PcloudGroupActivityDao extends BaseDao<PcloudGroupActivity> {
List<Long> getGroupClassifyIds(Map<String, Object> paraMap); List<Long> getGroupClassifyIds(Map<String, Object> paraMap);
Map<Long, GroupActivity4AppletDTO> getThridPartByIds(List<Long> ids); Map<Long, GroupActivity4AppletDTO> getThirdPartByIds(List<Long> ids);
PcloudGroupActivity getById(Long id); PcloudGroupActivity getById(Long id);
......
...@@ -104,8 +104,8 @@ public class PcloudGroupActivityDaoImpl extends BaseDaoImpl<PcloudGroupActivity> ...@@ -104,8 +104,8 @@ public class PcloudGroupActivityDaoImpl extends BaseDaoImpl<PcloudGroupActivity>
} }
@Override @Override
public Map<Long, GroupActivity4AppletDTO> getThridPartByIds(List<Long> list) { public Map<Long, GroupActivity4AppletDTO> getThirdPartByIds(List<Long> list) {
return super.getSqlSession().selectMap(getStatement("getThridPartByIds"), list,"id"); return super.getSqlSession().selectMap(getStatement("getThirdPartByIds"), list,"id");
} }
@Override @Override
......
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
</select> </select>
<!--根据id获取第三方群信息 --> <!--根据id获取第三方群信息 -->
<select id="getThridPartByIds" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO"> <select id="getThirdPartByIds" resultType="com.pcloud.book.applet.dto.GroupActivity4AppletDTO">
SELECT SELECT
a.id, a.id,
a.id groupActivityId, a.id groupActivityId,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment