--no commit message

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

@@ -31,12 +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) "
-			+ "<if test='"+ NOTBLANK +"(form.meridianId) and form.meridianId == 0'>"
-			+ " AND a.meridianId is null "
-			+ "</if>"
-			+ "<if test='"+ NOTBLANK +"(form.meridianId) and form.meridianId != 0'>"
+			+ "<if test='form.key == 2'>"
 			+ " AND a.meridianId = #{form.meridianId} "
 			+ "</if>"
+			+ "<if test='form.key == 1'>"
+			+ " AND a.meridianId is null "
+			+ "</if>"
 		    + " order by a.editTime desc "
 		    + "</script>")
 	List<AcupointLibraryListVO> query(@Param("form")QueryAcupointLibraryForm form);

app/resource/src/main/java/com/zrqx/resource/bg/service/acupointlibrary/AcupointLibrarySerivceImpl.java

@@ -182,6 +182,13 @@ public class AcupointLibrarySerivceImpl extends BaseServiceImpl<AcupointLibrary,
 	@Override
 	public PageInfo<AcupointLibraryListVO> page(QueryAcupointLibraryForm form, PageParam pageParam) {
 		startPage(pageParam);
+		if(StringUtils.isBlank(form.getMeridianId())) {
+			form.setKey(0);
+		}else if("0".equals(form.getMeridianId())){
+			form.setKey(1);
+		}else {
+			form.setKey(2);
+		}
 		return new PageInfo<AcupointLibraryListVO>(mapper.query(form));
 	}