Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
ec7ca7be
Commit
ec7ca7be
authored
Jul 29, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'base-modify' of
http://113.105.137.151:22280/youjj/cloud-platform
into base-modify
parents
bc60da2f
d5028ab7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
UserMemberAdminController.java
.../security/admin/rest/admin/UserMemberAdminController.java
+0
-5
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java
View file @
ec7ca7be
...
...
@@ -57,11 +57,6 @@ public class UserMemberAdminController {
if
(
userMemberData
.
size
()
<
1
)
{
return
ObjectRestResponse
.
createFailedResult
(
1001
,
"导入不能没数据!!!"
);
}
for
(
String
[]
userMemberDatum
:
userMemberData
)
{
if
(
userMemberDatum
.
length
!=
4
){
return
ObjectRestResponse
.
createFailedResult
(
1002
,
"数据不完整!!!"
);
}
}
userMemberData
.
remove
(
0
);
try
{
int
effectSize
=
baseUserMemberExportBiz
.
importUserMember
(
userMemberData
,
Integer
.
valueOf
(
infoFromToken
.
getId
()),
infoFromToken
.
getUniqueName
());
...
...
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