Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
shop
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
曲欣亮
shop
Commits
401e4263
Commit
401e4263
authored
Aug 13, 2020
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x
parent
c152c692
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
CommonController.java
src/main/java/com/egolm/shop/api/CommonController.java
+1
-1
No files found.
src/main/java/com/egolm/shop/api/CommonController.java
View file @
401e4263
...
...
@@ -126,7 +126,7 @@ public class CommonController {
List
<
Map
<
String
,
Object
>>
goodsTags
=
jdbcTemplate
.
queryForList
(
"select sGoodsTagID, sGoodsTag from tOrgGoodsTag where sOrgNO = ? and nTag&1 = 0"
,
sOrgNO
);
Map
<
String
,
Object
>
shareInfo
=
new
HashMap
<
String
,
Object
>();
try
{
shareInfo
=
jdbcTemplate
.
queryForMap
(
"SELECT SharePicUrl = sPicUrl, ShareTitle = sShareTitle FROM tOrg WHERE sOrgNO = ? AND sAppID = ?"
,
appId
,
sOrgNO
);
shareInfo
=
jdbcTemplate
.
queryForMap
(
"SELECT SharePicUrl = sPicUrl, ShareTitle = sShareTitle FROM tOrg WHERE sOrgNO = ? AND sAppID = ?"
,
sOrgNO
,
appId
);
}
catch
(
EmptyResultDataAccessException
e
)
{}
return
Rjx
.
jsonOk
().
set
(
"OrgInfo"
,
map
).
set
(
"PicInfo"
,
omap
).
set
(
"ExemptCheck"
,
cmap
).
set
(
"payTypes"
,
payTypes
).
set
(
"goodsTags"
,
goodsTags
).
set
(
"shareInfo"
,
shareInfo
).
toJson
();
...
...
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