anderx месяцев назад: 5
Родитель
Сommit
ba4a8564a6

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseLogMapper.xml

@@ -186,7 +186,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="listPublicReleaseLog" resultType="com.goafanti.weChat.bo.outPublicReleaseLog">
-  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,a.photo_url photoUrl,
+  select a.id,a.aid ,a.prid ,a.remarks ,a.status ,b.name aname,a.photo_url photoUrl,a.create_time createTime,
 	date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes
 	from public_release_log a left join admin b on a.aid =b.id
 	left  join public_release pr  on a.prid =pr.id

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1156,7 +1156,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					}
 					//获取驳回或者撤销后的列表
 					if(!outPublicReleaseLogs.isEmpty()){
-						List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream().filter(e -> e.getCreateTime().getTime() > time).collect(Collectors.toList());
+						List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream()
+								.filter(e -> e !=null&&e.getCreateTime().getTime() > time).collect(Collectors.toList());
 						if (!collect1.isEmpty()) {
 							Set<String> aidSet = collect1.stream()
 									.map(outPublicReleaseLog::getAid)