Commit 1de52658 authored by wzp's avatar wzp

修改bug

parent 807713a4
......@@ -123,7 +123,7 @@ public interface LearningContentBoardMapper extends BaseMapper<LearningContentBo
+ "SELECT distinct a.* from "
+ "(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 "
+ "and eb.is_published = 1 and eb.is_deleted = 0 and lc.is_deleted = 0 "
+ "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='nameOrCode != null'>"
+"AND ( eb.name LIKE CONCAT('%', #{nameOrCode}, '%') OR eb.name_pin_yin LIKE CONCAT('%', #{nameOrCode}, '%') " +
......
......@@ -325,8 +325,10 @@ public class LoginController extends BaseController {
String regUrl;
if ("H5".equalsIgnoreCase(clientType)) {
regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/h5/login";
// regUrl = request.getScheme() + "://" + request.getServerName() + "/h5/login";
} else {
regUrl = request.getScheme() + "://" + request.getServerName() + ":8088/plat/#/login";
// regUrl = request.getScheme() + "://" + request.getServerName() + "/plat/#/login";
}
QrConfig config = new QrConfig(width, height);
config.setCharset(StandardCharsets.UTF_8);
......
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