记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
b775809c
Commit
b775809c
authored
Mar 31, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 审核相关文案提示
parent
73d36bd9
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
252 additions
and
235 deletions
+252
-235
bootstrap-client-admin-web.yml
...min-web/src/main/resources/bootstrap-client-admin-web.yml
+4
-4
list.html
...resources/templates/zhengzai/smile/organization/list.html
+8
-8
detail.html
...rces/templates/zhengzai/smile/userPendingList/detail.html
+239
-222
SmileUserServiceImpl.java
...min/zhengzai/smile/service/impl/SmileUserServiceImpl.java
+1
-1
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml
View file @
b775809c
...
...
@@ -10,9 +10,9 @@ spring:
cloud
:
config
:
# uri: http://127.0.0.1:7002/support-config
uri
:
http://39.107.71.112:7002/support-config
#
uri: http://39.107.71.112:7002/support-config
name
:
${spring.application.name},${spring.application.name}-druid
#默认为spring.application.name
profile
:
${liquidnet.cloudConfig.profile}
#
discovery:
#
enabled: true
#
service-id: liquidnet-support-config
discovery
:
enabled
:
true
service-id
:
liquidnet-support-config
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/organization/list.html
View file @
b775809c
...
...
@@ -258,16 +258,16 @@
title
:
'地区'
},
{
field
:
'a
ctivityTyp
e'
,
field
:
'a
gentNam
e'
,
title
:
'组长'
},
{
field
:
'smileUserVoOrgListOrdinary'
,
title
:
'组员'
,
formatter
:
function
(
value
,
row
,
index
)
{
}
},
//
{
//
field: 'smileUserVoOrgListOrdinary',
//
title: '组员',
//
formatter: function (value, row, index) {
//
//
}
//
},
{
title
:
'操作'
,
align
:
'center'
,
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html
View file @
b775809c
This diff is collapsed.
Click to expand it.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java
View file @
b775809c
...
...
@@ -166,7 +166,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
//根据uid查询redis中的用户缓存信息
SmileUserVO
smileUserVO
=
getSmileUserVOFromRedis
(
smileUserCheckVo
.
getUid
());
if
(!
smileUserVO
.
getType
().
equals
(
0
))
{
return
AjaxResult
.
warn
(
"已
经审核过
"
);
return
AjaxResult
.
warn
(
"已
审核
"
);
}
//判断是否通过
if
(
smileUserCheckVo
.
getType
().
equals
(
4
))
{
...
...
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