java/zhihuishenqu.git

			@@ -378,12 +378,12 @@
			Long id = comActDynVO.getId();
			BeanUtils.copyProperties(comActDynVO, comActDynDO);
			Integer isTopping = comActDynVO.getIsTopping();
			boolean b = isTopping.intValue() == 1;
			boolean b = isTopping.equals(1);
			if(b){
			ComActDynDO comActDynDO1 = comActDynService.getById(id);
			Integer status = comActDynDO1.getStatus();
			if (status.intValue()==0) {
			return R.fail("该动态还未发布");
			if (status.equals(0)) {
			return R.fail("待发布的社区动态不可置顶");
			}
			}
			boolean update = comActDynService.updateById(comActDynDO);

			@@ -471,8 +471,8 @@
			if(!photoActivityDOS.isEmpty()){
			ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
			BeanUtils.copyProperties(photoActivityDO,photoActivityVO);
			easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);
			}
			easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);

			//查询用户未读奖励金额
			BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId,communityId);

			@@ -61,6 +61,7 @@
			<if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != """>
			and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
			</if>
			order by cadt.create_at desc
			</select>

			<select id="getDynTypeListByAdmin" parameterType="com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO"

	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史