Commit 7d01fdaf authored by wzp's avatar wzp

修改bug

parent 1de52658
...@@ -120,8 +120,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -120,8 +120,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
@Select("<script>" @Select("<script>"
+ "SELECT distinct a.* from " + "SELECT eb.* FROM learning_project p,learning_content lc,learning_content_board lcb, exhibition_board eb "
+ "(SELECT eb.* FROM learning_project p,learning_content lc,learning_content_board lcb, exhibition_board eb "
+ "WHERE lcb.exhibition_board_id = eb.id and p.id = lc.learning_project_id and lc.id = lcb.learning_content_id " + "WHERE lcb.exhibition_board_id = eb.id and p.id = lc.learning_project_id and lc.id = lcb.learning_content_id "
+ "and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 and lc.is_published = 1" + "and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 and lc.is_published = 1"
+ "<if test='learningProjectId != null'>and p.id = #{learningProjectId} </if>" + "<if test='learningProjectId != null'>and p.id = #{learningProjectId} </if>"
...@@ -130,7 +129,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo ...@@ -130,7 +129,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
"OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " + "OR eb.name_first_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " +
"OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))" "OR eb.serial_no LIKE CONCAT('%', #{nameOrCode}, '%'))"
+ "</if>" + "</if>"
+ "order by lcb.sortorder, eb.create_time DESC)a " + "order by lcb.sortorder DESC, eb.create_time DESC "
+ "</script>" + "</script>"
) )
IPage<ExhibitionBoard> getBoardPageByLearningProjectId(Page<ExhibitionBoard> page, String learningProjectId, String nameOrCode); IPage<ExhibitionBoard> getBoardPageByLearningProjectId(Page<ExhibitionBoard> page, String learningProjectId, String nameOrCode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment