--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/samplebookapply/SampleBookApplyServiceImpl.java

@@ -48,6 +48,15 @@ public class SampleBookApplyServiceImpl extends BaseModelServiceImpl<SampleBookA
 	@Override
 	public PageInfo<SampleBookApplyVo> page(PageParam pageParam, QuerySampleBookApplyForm form) {
 		List<SampleBookApplyVo> list = this.list(pageParam, form, true);
+		list.forEach(vo ->{
+			//将学校地址置为收货地址
+			School school = schoolMapper.selectByPrimaryKey(vo.getRelationId());
+			if(school != null) {
+				if(StringUtils.isNotEmpty(school.getAddress())) {
+					vo.setAddress(school.getAddress());
+				}
+			}
+		});
 		return new PageInfo<SampleBookApplyVo>(list);
 	}
 
@@ -58,8 +67,10 @@ public class SampleBookApplyServiceImpl extends BaseModelServiceImpl<SampleBookA
 		SampleBookApplyVo vo = BeanUtils.copy(apply, SampleBookApplyVo.class);
 		//将学校的地址置为收货地址
 		School school = schoolMapper.selectByPrimaryKey(apply.getRelationId());
-		if(StringUtils.isNotEmpty(school.getAddress())) {
-			vo.setAddress(school.getAddress());
+		if(school != null) {
+			if(StringUtils.isNotEmpty(school.getAddress())) {
+				vo.setAddress(school.getAddress());
+			}
 		}
 		Member member = membreMapper.selectByPrimaryKey(apply.getMemberId());
 		if(member != null){