Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liqin
chnmuseum-party
Commits
1de52658
Commit
1de52658
authored
Jun 02, 2021
by
wzp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
807713a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
LearningContentBoardMapper.java
...cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
+1
-1
LoginController.java
...va/cn/chnmuseum/party/web/controller/LoginController.java
+2
-0
No files found.
src/main/java/cn/chnmuseum/party/mapper/LearningContentBoardMapper.java
View file @
1de52658
...
...
@@ -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}, '%') "
+
...
...
src/main/java/cn/chnmuseum/party/web/controller/LoginController.java
View file @
1de52658
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment