java/zhihuishenqu.git

			@@ -23,18 +23,8 @@
			</component>
			<component name="ChangeListManager">
			<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
			<change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/RichTextUtil.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActDynVO.class" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.class" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -419,7 +409,7 @@
			<workItem from="1611019208339" duration="94460000" />
			<workItem from="1611365644515" duration="33195000" />
			<workItem from="1611536010905" duration="21843000" />
			<workItem from="1611622682269" duration="10848000" />
			<workItem from="1611622682269" duration="11651000" />
			</task>
			<servers />
			</component>

			@@ -243,12 +243,17 @@
			if (!ObjectUtils.isEmpty(records)) {
			records.forEach(comActEasyPhotoVO1 -> {
			Long id = comActEasyPhotoVO1.getId();
			Integer status = comActEasyPhotoVO1.getStatus();
			Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
			ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
			if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
			comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
			}else {
			comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
			}
			if(status.intValue()==4&&null==feedbackAt){
			comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
			}
			});
			iPage.setRecords(records);
			}

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -25,7 +25,7 @@
			"SELECT\n" +
			"p.id,\n" +
			"u.`name` sponsor_name,\n" +
			"u.phone sponsor_phone,\n" +
			"u.phone phone,\n" +
			"count(pu.id)giveThumbsUpNum,\n" +
			"u.image_url,\n" +
			"p.happen_addr,\n" +
			@@ -80,7 +80,7 @@
			"SELECT\n" +
			"p.id,\n" +
			"u.`name` sponsor_name,\n" +
			"u.phone sponsor_phone,\n" +
			"u.phone phone,\n" +
			"count(pu.id)giveThumbsUpNum,\n" +
			"u.image_url,\n" +
			"p.happen_addr,\n" +