--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/mapper/acupointlibrary/AcupointLibraryMapper.java

@@ -31,7 +31,12 @@ public interface AcupointLibraryMapper extends BaseMapper<AcupointLibrary> {
 			+ " AND (a.name like concat('%',#{form.name},'%')  OR a.internationalCode like concat('%',#{form.name},'%')) "
 			+ "</if>"
 		    + " eq(a.status,form.status) "
-		    + " eq(a.meridianId,form.meridianId) "
+			+ "<if test='"+ NOTBLANK +"(form.meridianId) and form.meridianId == 0'>"
+			+ " AND a.meridianId is null "
+			+ "</if>"
+			+ "<if test='"+ NOTBLANK +"(form.meridianId) and form.meridianId != 0'>"
+			+ " AND a.meridianId = #{form.meridianId} "
+			+ "</if>"
 		    + " order by a.editTime desc "
 		    + "</script>")
 	List<AcupointLibraryListVO> query(@Param("form")QueryAcupointLibraryForm form);