--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/mapper/member/MemberMapper.java

@@ -59,7 +59,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 	 * @date: 2019年4月9日 下午8:11:30
 	 */
 	@Select(" <script> "
-			+ " select m.id as memberId,m.name as userName, m.phone,m.type,s.name as schoolName,s.address from me_member m "
+			+ " select DISTINCT m.id as memberId,m.name as userName, m.phone,m.type,s.name as schoolName,s.address from me_member m "
 			+ " left join me_school s on m.relationId = s.id "
 			+ " WHERE  1=1 and m.type = 0"
 			+ "<if test = 'query.relationId != null'> "  

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/samplebookvoucher/FgSmapleBookServiceImpl.java

@@ -23,6 +23,10 @@ public class FgSmapleBookServiceImpl extends BaseModelServiceImpl<SampleBook,Int
 	@Override
 	public Integer getNum() {
 		Member member = redis.getMember();
+		Integer num = fgSampleBookMapper.getNum(member.getId());
+		if(num == null || num.intValue() == 0){
+			return 0;
+		}
 		return fgSampleBookMapper.getNum(member.getId());
 	}